Fix obvious missing line. + Cleanup.

Removed some commented out code that doesn't work anymore anyway