Correct cleanup of discovered waypoint entries