Clean up of cruft.

TODO:
See last commit.