Cleanup : commented out code, unused local variables, missing semicolons, noop code.

Reviewer: Helen D
Issue: Clean Code