Various cleanup

This PR cleans up a bunch of cruft, and generally touches everything but the code itself.

Review: @kyleconroy