Remove flightplan dependency