issue #7

Removed commented-out code. I am glad this is gone because it was pretty
strange and weird code that was pretty hacky.