Cleaned up code

Removed some commented out code