Removing unused and commented out code.

Reviewer: Helen D
Issue: Code Cleanup