Upgrade Waypoints, clean up destroy/remove chaining
Merge pull request #192 from imakewebthings/waypoint-cleanup

Upgrade Waypoints, clean up destroy/remove chaining