Remove a bunch of commented out code