Cleanup Waypoint.