Cleans up commented-out code.
Merge pull request #2 from ArcticEcho/master

Cleans up commented-out code.