Remove old hacky collision detection with Map.