Remove the dynamic waypoint create and expand the size of waypoint limit