removed lots of commented out code and unnecessary comments
Merge pull request #36 from hey-you-project/code-cleanup

removed lots of commented out code and unnecessary comments