Fix for cones breaking end-game cleanup