remove unnecessary waypoint include