Remove before saving waypoints