Removed a bunch of commented out code