diff --git a/src/blackcore/icaodatareader.cpp b/src/blackcore/icaodatareader.cpp
index 10fd6601a..fba7cb8e3 100644
--- a/src/blackcore/icaodatareader.cpp
+++ b/src/blackcore/icaodatareader.cpp
@@ -177,7 +177,7 @@ namespace BlackCore
 
     CUrl CIcaoDataReader::getBaseUrl() const
     {
-        CUrl baseUrl(this->m_setup.get().dbIcaoReaderUrl());
+        const CUrl baseUrl(sApp->getGlobalSetup().dbIcaoReaderUrl());
         return baseUrl;
     }
 
diff --git a/src/blackcore/icaodatareader.h b/src/blackcore/icaodatareader.h
index 1ae86ce6a..afa085e5d 100644
--- a/src/blackcore/icaodatareader.h
+++ b/src/blackcore/icaodatareader.h
@@ -14,7 +14,6 @@
 
 #include "blackcore/blackcoreexport.h"
 #include "blackcore/databasereader.h"
-#include "blackcore/data/globalsetup.h"
 #include "blackmisc/countrylist.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
@@ -131,8 +130,6 @@ namespace BlackCore
         mutable QReadWriteLock m_lockAircraft;
         mutable QReadWriteLock m_lockCountry;
 
-        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
-
         //! Base URL
         BlackMisc::Network::CUrl getBaseUrl() const;
 
diff --git a/src/blackcore/modeldatareader.cpp b/src/blackcore/modeldatareader.cpp
index 6a35f988c..e212dd45e 100644
--- a/src/blackcore/modeldatareader.cpp
+++ b/src/blackcore/modeldatareader.cpp
@@ -418,7 +418,7 @@ namespace BlackCore
 
     CUrl CModelDataReader::getBaseUrl() const
     {
-        CUrl baseUrl(m_setup.get().dbModelReaderUrl());
+        const CUrl baseUrl(sApp->getGlobalSetup().dbModelReaderUrl());
         return baseUrl;
     }
 
diff --git a/src/blackcore/modeldatareader.h b/src/blackcore/modeldatareader.h
index 8b5e0a70a..f9708fcfc 100644
--- a/src/blackcore/modeldatareader.h
+++ b/src/blackcore/modeldatareader.h
@@ -14,7 +14,6 @@
 
 #include "blackcore/blackcoreexport.h"
 #include "blackcore/databasereader.h"
-#include "blackcore/data/globalsetup.h"
 #include "blackmisc/aviation/liverylist.h"
 #include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
@@ -143,8 +142,6 @@ namespace BlackCore
         mutable QReadWriteLock m_lockLivery;
         mutable QReadWriteLock m_lockModels;
 
-        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
-
         //! Base URL
         BlackMisc::Network::CUrl getBaseUrl() const;
 
diff --git a/src/blackcore/vatsimmetarreader.cpp b/src/blackcore/vatsimmetarreader.cpp
index 340be5677..487bcac0c 100644
--- a/src/blackcore/vatsimmetarreader.cpp
+++ b/src/blackcore/vatsimmetarreader.cpp
@@ -63,7 +63,7 @@ namespace BlackCore
     void CVatsimMetarReader::ps_readMetars()
     {
         this->threadAssertCheck();
-        QUrl url(m_setup.get().vatsimMetarsUrl());
+        const CUrl url(sApp->getGlobalSetup().vatsimMetarsUrl());
         if (url.isEmpty()) { return; }
         Q_ASSERT_X(sApp, Q_FUNC_INFO, "No Application");
         sApp->getFromNetwork(url, { this, &CVatsimMetarReader::ps_decodeMetars});
diff --git a/src/blackcore/vatsimmetarreader.h b/src/blackcore/vatsimmetarreader.h
index 8115996ff..999c2a8d1 100644
--- a/src/blackcore/vatsimmetarreader.h
+++ b/src/blackcore/vatsimmetarreader.h
@@ -13,7 +13,6 @@
 #define BLACKCORE_VATSIMMETARREADER_H
 
 #include "blackcoreexport.h"
-#include "blackcore/data/globalsetup.h"
 #include "blackmisc/threadedreader.h"
 #include "blackmisc/weather/metardecoder.h"
 #include "blackmisc/weather/metarset.h"
@@ -70,7 +69,6 @@ namespace BlackCore
     private:
         BlackMisc::Weather::CMetarDecoder m_metarDecoder;
         BlackMisc::Weather::CMetarSet     m_metars;
-        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
     };
 }
 #endif // guard
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index 45f6217e3..153ab708d 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -28,7 +28,6 @@
 #include "blackgui/mainwindowaccess.h"
 #include "blackcore/contextallinterfaces.h"
 #include "blackcore/actionbind.h"
-#include "blackcore/data/globalsetup.h"
 #include "blackmisc/network/textmessage.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/identifiable.h"
@@ -117,7 +116,6 @@ private:
     bool                                           m_init = false;
     BlackGui::CManagedStatusBar                    m_statusBar;
     BlackMisc::CLogSubscriber                      m_logSubscriber { this, &SwiftGuiStd::ps_displayStatusMessageInGui };
-    BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this};  //!< setup cache
 
     // contexts
     bool m_coreAvailable           = false;
diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
index cc47913a2..271453127 100644
--- a/src/swiftguistandard/swiftguistdmenus.cpp
+++ b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -9,8 +9,7 @@
 
 #include "swiftguistd.h"
 #include "ui_swiftguistd.h"
-#include "blackmisc/datacache.h"
-#include "blackmisc/settingscache.h"
+#include "blackcore/application.h"
 #include "blackgui/stylesheetutility.h"
 #include "blackgui/components/settingscomponent.h"
 #include "blackgui/components/logcomponent.h"
@@ -131,7 +130,7 @@ void SwiftGuiStd::ps_onMenuClicked()
     }
     else if (sender == this->ui->menu_InternalsSetup)
     {
-        QString setup(this->m_setup.get().convertToQString("\n", true));
+        QString setup(sApp->getGlobalSetup().convertToQString("\n", true));
         this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(setup);
         this->displayConsole();
     }