Final final changes

This is the second time I've deleted these.  They keep reappearing.
Anyway, I think having 5 waypoints will be confusing to next year's
group and it's easier to deleted them than to write the documentation.