Clean up waypoints