Removed some commented out code and such

Removed some commented out code and such