No longer optimize waypoints