Clean up / dead code elimination.

Delete some code that is no longer being used, but did not get deleted
during merging because of cherry-picking / out of order integration of
several concurrent pull requests.

Closes #22.