Cleanup

Cleaned up some unnecessary commented out code