Removed a whole bunch of commented out code