diff --git a/src/core/data/networksetup.cpp b/src/core/data/networksetup.cpp
index b555b8dff..5b2af7956 100644
--- a/src/core/data/networksetup.cpp
+++ b/src/core/data/networksetup.cpp
@@ -45,8 +45,7 @@ namespace swift::core::data
     {
         const CServer server(this->getLastServer());
         if (server.isNull()) { return false; }
-        return server.getEcosystem() == CEcosystem::privateFsd() || server.getEcosystem() == CEcosystem::swiftTest() ||
-               server.getEcosystem() == CEcosystem::swift();
+        return server.getEcosystem() == CEcosystem::privateFsd();
     }
 
     void CNetworkSetup::onSettingsChanged() { emit this->setupChanged(); }
diff --git a/src/misc/network/ecosystem.cpp b/src/misc/network/ecosystem.cpp
index 771f9469a..0e7ada7d1 100644
--- a/src/misc/network/ecosystem.cpp
+++ b/src/misc/network/ecosystem.cpp
@@ -29,18 +29,6 @@ namespace swift::misc::network
         return e;
     }
 
-    const CEcosystem &CEcosystem::swift()
-    {
-        static const CEcosystem e(Swift);
-        return e;
-    }
-
-    const CEcosystem &CEcosystem::swiftTest()
-    {
-        static const CEcosystem e(SwiftTest);
-        return e;
-    }
-
     const CEcosystem &CEcosystem::privateFsd()
     {
         static const CEcosystem e(PrivateFSD);
@@ -51,16 +39,12 @@ namespace swift::misc::network
     {
         static const QString u("unknown");
         static const QString v("VATSIM");
-        static const QString s("swift");
-        static const QString st("swift (testing)");
         static const QString fsd("FSD (private)");
         static const QString no("no system");
 
         switch (this->getSystem())
         {
         case VATSIM: return v;
-        case Swift: return s;
-        case SwiftTest: return st;
         case PrivateFSD: return fsd;
         case NoSystem: return no;
         case Unspecified:
diff --git a/src/misc/network/ecosystem.h b/src/misc/network/ecosystem.h
index 2d6489422..06480686b 100644
--- a/src/misc/network/ecosystem.h
+++ b/src/misc/network/ecosystem.h
@@ -33,8 +33,6 @@ namespace swift::misc::network
             Unspecified, //!< unspecified
             NoSystem, //!< no relevant ecosystem
             VATSIM, //!< VATSIM
-            SwiftTest, //!< swift test server
-            Swift, //!< Future usage
             PrivateFSD //!< Private FSD environment
         };
 
@@ -77,12 +75,6 @@ namespace swift::misc::network
         //! VATSIM eco system
         static const CEcosystem &vatsim();
 
-        //! swift eco system
-        static const CEcosystem &swift();
-
-        //! swift test eco system
-        static const CEcosystem &swiftTest();
-
         //! FSD private
         static const CEcosystem &privateFsd();
 
diff --git a/src/misc/network/ecosystemlist.cpp b/src/misc/network/ecosystemlist.cpp
index 37b504e83..03af9042f 100644
--- a/src/misc/network/ecosystemlist.cpp
+++ b/src/misc/network/ecosystemlist.cpp
@@ -19,7 +19,7 @@ namespace swift::misc::network
     const CEcosystemList &CEcosystemList::allKnownSystems()
     {
         static const CEcosystemList s(
-            { CEcosystem::vatsim(), CEcosystem::swift(), CEcosystem::swiftTest(), CEcosystem::privateFsd() });
+            { CEcosystem::vatsim(), CEcosystem::privateFsd() });
         return s;
     }
 } // namespace swift::misc::network
diff --git a/src/misc/network/ecosystemprovider.cpp b/src/misc/network/ecosystemprovider.cpp
index 231e96e96..5c4a1a9b5 100644
--- a/src/misc/network/ecosystemprovider.cpp
+++ b/src/misc/network/ecosystemprovider.cpp
@@ -74,10 +74,6 @@ namespace swift::misc::network
     {
         if (!this->hasProvider()) { return false; }
         if (this->isCurrentEcosystemVATSIM()) { return false; }
-        if (this->isCurrentEcosystem(CEcosystem::swiftTest()))
-        {
-            return false;
-        } // our test server is supposed to be I VATSIM system
         return !this->getCurrentEcosystem().isUnspecified(); // other know system which is specified
     }
 
diff --git a/src/misc/network/server.cpp b/src/misc/network/server.cpp
index 3117f2570..052b7e373 100644
--- a/src/misc/network/server.cpp
+++ b/src/misc/network/server.cpp
@@ -21,7 +21,7 @@ namespace swift::misc::network
     const QList<int> &CServer::allServerTypes()
     {
         static const QList<int> all(
-            { FSDServerVatsim, VoiceServerVatsim, FSDServer, VoiceServer, WebService, Unspecified });
+            { FSDServerVatsim, FSDServer, Unspecified });
         return all;
     }
 
@@ -65,7 +65,7 @@ namespace swift::misc::network
     {
         static const CServer s =
             CServer("ES Tower", "Euroscope Tower view", "localhost", 6809, CUser(), CFsdSetup::vatsimStandard(),
-                    CEcosystem(CEcosystem::vatsim()), CServer::VoiceServerVatsim);
+                    CEcosystem(CEcosystem::vatsim()), CServer::FSDServer);
         return s;
     }
 
@@ -91,7 +91,6 @@ namespace swift::misc::network
 
         // cross dependency
         if (ecosystem.isSystem(CEcosystem::VATSIM)) { m_serverType = FSDServerVatsim; }
-        if (ecosystem.isSystem(CEcosystem::SwiftTest)) { m_serverType = FSDServerVatsim; }
         return true;
     }
 
@@ -247,19 +246,13 @@ namespace swift::misc::network
     const QString &CServer::serverTypeToString(CServer::ServerType server)
     {
         static const QString fsdVatsim("FSD [VATSIM]");
-        static const QString voiceVatsim("voice [VATSIM]");
         static const QString fsdLegacy("FSD (legacy)");
-        static const QString voice("voice");
-        static const QString webService("web service");
         static const QString unspecified("unspecified");
 
         switch (server)
         {
         case FSDServerVatsim: return fsdVatsim;
-        case VoiceServerVatsim: return voiceVatsim;
         case FSDServer: return fsdLegacy;
-        case VoiceServer: return voice;
-        case WebService: return webService;
         case Unspecified:
         default: return unspecified;
         }
diff --git a/src/misc/network/server.h b/src/misc/network/server.h
index 2b7e0829c..709a8baa0 100644
--- a/src/misc/network/server.h
+++ b/src/misc/network/server.h
@@ -48,9 +48,6 @@ namespace swift::misc::network
             Unspecified,
             FSDServerVatsim,
             FSDServer,
-            VoiceServerVatsim,
-            VoiceServer,
-            WebService,
         };
 
         //! Allows to iterate over all ServerType