Fix buildscript. Remove pointless code from waypoint.