more waypoint removal