Flights module cleanup