Remove Waypoint Expansion From Tree
Merge