Cleanup comments and unused code (minor)