diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index 1b3fa34c2..46e01277b 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -42,6 +42,11 @@ namespace BlackCore
             return getDbRootDirectoryUrl();
         }
 
+        CUrl CGlobalSetup::getDbAirportReaderUrl() const
+        {
+            return getDbRootDirectoryUrl();
+        }
+
         CUrl CGlobalSetup::getDbInfoReaderUrl() const
         {
             return getDbRootDirectoryUrl();
@@ -52,13 +57,6 @@ namespace BlackCore
             return this->m_sharedUrls;
         }
 
-        CUrlList CGlobalSetup::getSwiftAirportUrls() const
-        {
-            // currently subdir of shared, this might change
-            const CUrlList airportUrls(getSwiftSharedUrls().appendPath(versionString() + "/airports/airports.json"));
-            return airportUrls;
-        }
-
         CUrl CGlobalSetup::getDbHomePageUrl() const
         {
             return getDbRootDirectoryUrl().withAppendedPath("/page/index.php");
@@ -190,6 +188,9 @@ namespace BlackCore
             s.append("Model DB reader: ");
             s.append(getDbModelReaderUrl().toQString(i18n));
             s.append(separator);
+            s.append("Airport DB reader: ");
+            s.append(getDbAirportReaderUrl().toQString(i18n));
+            s.append(separator);
             s.append("DB home page: ");
             s.append(getDbHomePageUrl().toQString(i18n));
             s.append(separator);
@@ -200,10 +201,6 @@ namespace BlackCore
             s.append(getSwiftDbDataFileLocationUrls().toQString(i18n));
             s.append(separator);
 
-            s.append("swift airport files: ");
-            s.append(getSwiftAirportUrls().toQString(i18n));
-            s.append(separator);
-
             s.append("VATSIM bookings: ");
             s.append(getVatsimBookingsUrl().toQString(i18n));
             s.append(separator);
@@ -249,8 +246,6 @@ namespace BlackCore
                 return CVariant::fromValue(this->getBootstrapFileUrls());
             case IndexSwiftDbFiles:
                 return CVariant::fromValue(this->getSwiftDbDataFileLocationUrls());
-            case IndexSwiftAirportUrls:
-                return CVariant::fromValue(this->getSwiftAirportUrls());
             case IndexShared:
                 return CVariant::fromValue(this->m_sharedUrls);
             case IndexWasLoaded:
diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h
index 902d3ffef..044af7b00 100644
--- a/src/blackcore/data/globalsetup.h
+++ b/src/blackcore/data/globalsetup.h
@@ -48,7 +48,6 @@ namespace BlackCore
                 IndexVatsimMetars,
                 IndexVatsimData,
                 IndexSwiftDbFiles,
-                IndexSwiftAirportUrls,
                 IndexBootstrap,
                 IndexUpdateInfo,
                 IndexWasLoaded,
@@ -103,15 +102,15 @@ namespace BlackCore
             //! Model reader URL
             BlackMisc::Network::CUrl getDbModelReaderUrl() const;
 
+            //! Airport reader URL
+            BlackMisc::Network::CUrl getDbAirportReaderUrl() const;
+
             //! Info data reader URL
             BlackMisc::Network::CUrl getDbInfoReaderUrl() const;
 
             //! Shared URLs
             const BlackMisc::Network::CUrlList &getSwiftSharedUrls() const;
 
-            //! Airport URLs
-            BlackMisc::Network::CUrlList getSwiftAirportUrls() const;
-
             //! URL to read VATSIM bookings
             const BlackMisc::Network::CUrl &getVatsimBookingsUrl() const { return m_vatsimBookingsUrl; }
 
diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp
index 686a85024..75f08f9de 100644
--- a/src/blackcore/db/airportdatareader.cpp
+++ b/src/blackcore/db/airportdatareader.cpp
@@ -60,7 +60,7 @@ namespace BlackCore
 
         CUrl CAirportDataReader::getAirportsUrl() const
         {
-            return sApp->getGlobalSetup().getDbRootDirectoryUrl().withAppendedPath("service/jsonairport.php");
+            return sApp->getGlobalSetup().getDbAirportReaderUrl().withAppendedPath("service/jsonairport.php");
         }
 
         void CAirportDataReader::ps_parseAirportData(QNetworkReply *nwReply)