Added waypoint data cleaning.