Remove cruft, clean up comments