minor cleanups

removed some commented-out code, added some new comments