Remove physics, commented out code