(PUP-1044) Cleanup commented out code, and comments