Removed some more commented out code