Ripping out Waypoint stuff