Remove dead code, and clean up some commentary