Fix broken waypoints, remove banner