removed a bunch of commented out code