Removed superfluous waypoint.clear in map