OP-1119 Added real-time updates of the flights combobox. Added some cleanup code.