Modify ClearWaypoints to run on all waypoints consistently