Added lazy loading to removeFlight