removing a bunch of commented out code