remove unused include
add lists to manage waypoints and connectors