Merge clean up: runs but no physics