clean up obsolete comments (and commented out code) and normalize spacing