Cleanup

Removed some commented code.