finished cutover to Flight objects and cleaned up