diff --git a/game/aircraftparkinglocation.py b/game/aircraftparkinglocation.py
new file mode 100644
index 00000000..e69de29b
diff --git a/game/ato/flight.py b/game/ato/flight.py
index e69d872c..458b4251 100644
--- a/game/ato/flight.py
+++ b/game/ato/flight.py
@@ -149,10 +149,6 @@ class Flight(SidcDescribable):
     def is_helo(self) -> bool:
         return self.unit_type.dcs_unit_type.helicopter
 
-    @property
-    def from_cp(self) -> ControlPoint:
-        return self.departure
-
     @property
     def points(self) -> List[FlightWaypoint]:
         return self.flight_plan.waypoints[1:]
diff --git a/game/ato/flightplans/flightplan.py b/game/ato/flightplans/flightplan.py
index 29b0ee05..5135601b 100644
--- a/game/ato/flightplans/flightplan.py
+++ b/game/ato/flightplans/flightplan.py
@@ -283,7 +283,7 @@ class FlightPlan(ABC, Generic[LayoutT]):
     def estimate_ground_ops(self) -> timedelta:
         if self.flight.start_type in {StartType.RUNWAY, StartType.IN_FLIGHT}:
             return timedelta()
-        if self.flight.from_cp.is_fleet:
+        if self.flight.departure.is_fleet:
             return timedelta(minutes=2)
         else:
             return timedelta(minutes=8)
diff --git a/game/missiongenerator/aircraft/flightgroupconfigurator.py b/game/missiongenerator/aircraft/flightgroupconfigurator.py
index 5b579ade..12913f3f 100644
--- a/game/missiongenerator/aircraft/flightgroupconfigurator.py
+++ b/game/missiongenerator/aircraft/flightgroupconfigurator.py
@@ -110,7 +110,7 @@ class FlightGroupConfigurator:
             flight_type=self.flight.flight_type,
             units=self.group.units,
             size=len(self.group.units),
-            friendly=self.flight.from_cp.captured,
+            friendly=self.flight.departure.captured,
             departure_delay=mission_start_time,
             departure=self.flight.departure.active_runway(
                 self.game.theater, self.game.conditions, self.dynamic_runways
diff --git a/game/missiongenerator/aircraft/waypoints/waypointgenerator.py b/game/missiongenerator/aircraft/waypoints/waypointgenerator.py
index 259dadf4..85d5ebef 100644
--- a/game/missiongenerator/aircraft/waypoints/waypointgenerator.py
+++ b/game/missiongenerator/aircraft/waypoints/waypointgenerator.py
@@ -286,7 +286,7 @@ class WaypointGenerator:
             # hot aircraft hours before their takeoff time.
             return True
 
-        if self.flight.from_cp.is_fleet:
+        if self.flight.departure.is_fleet:
             # Carrier spawns will crowd the carrier deck, especially without
             # super carrier.
             # TODO: Is there enough parking on the supercarrier?
diff --git a/qt_ui/models.py b/qt_ui/models.py
index 707b5e4e..cc65fc89 100644
--- a/qt_ui/models.py
+++ b/qt_ui/models.py
@@ -138,7 +138,7 @@ class PackageModel(QAbstractListModel):
     @staticmethod
     def text_for_flight(flight: Flight) -> str:
         """Returns the text that should be displayed for the flight."""
-        origin = flight.from_cp.name
+        origin = flight.departure.name
         startup = flight.flight_plan.startup_time()
         return f"{flight} from {origin} at {startup}"
 
diff --git a/qt_ui/widgets/ato.py b/qt_ui/widgets/ato.py
index 36a253df..0b7b2836 100644
--- a/qt_ui/widgets/ato.py
+++ b/qt_ui/widgets/ato.py
@@ -46,7 +46,7 @@ class FlightDelegate(TwoColumnRowDelegate):
             clients = self.num_clients(index)
             return f"Player Slots: {clients}" if clients else ""
         elif (row, column) == (1, 0):
-            origin = flight.from_cp.name
+            origin = flight.departure.name
             if flight.arrival != flight.departure:
                 return f"From {origin} to {flight.arrival.name}"
             return f"From {origin}"
diff --git a/qt_ui/windows/mission/QPlannedFlightsView.py b/qt_ui/windows/mission/QPlannedFlightsView.py
index fc7eed78..2839d14b 100644
--- a/qt_ui/windows/mission/QPlannedFlightsView.py
+++ b/qt_ui/windows/mission/QPlannedFlightsView.py
@@ -25,7 +25,7 @@ class QPlannedFlightsView(QListView):
         self.flight_items = []
         for package in self.game_model.ato_model.packages:
             for flight in package.flights:
-                if flight.from_cp == self.cp:
+                if flight.departure == self.cp:
                     item = QFlightItem(package.package, flight)
                     self.flight_items.append(item)
 
diff --git a/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py b/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py
index 8c05e499..720d5eda 100644
--- a/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py
+++ b/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py
@@ -32,7 +32,7 @@ class FlightPlanPropertiesGroup(QGroupBox):
         self.departure_time = QLabel()
         layout.addLayout(
             QLabeledWidget(
-                f"Departing from <b>{flight.from_cp.name}</b>", self.departure_time
+                f"Departing from <b>{flight.departure.name}</b>", self.departure_time
             )
         )
         self.package_model.tot_changed.connect(self.update_departure_time)