Kill some commented out code and other cleanups (#649)

2 files changed