diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index 1f54bcc7..2e2d4e36 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -12,11 +12,6 @@ x ## Ptr make_ ## x( Args &&...args ) { \
 return std::make_shared< x >( std::forward< Args >( args ) ... ); }\
 typedef std::vector< x > x ## PtrList;
 
-namespace Sapphire
-{
-  TYPE_FORWARD( Framework );
-}
-
 namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index b3d85ddb..6bc2e174 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -25,9 +25,8 @@ extern Lobby::ServerLobby g_serverLobby;
 extern Lobby::RestConnector g_restConnector;
 
 Lobby::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
-                                                Sapphire::Network::AcceptorPtr pAcceptor,
-                                                FrameworkPtr pFw ) :
-  Sapphire::Network::Connection( pHive, pFw ),
+                                                Sapphire::Network::AcceptorPtr pAcceptor ) :
+  Sapphire::Network::Connection( pHive ),
   m_pAcceptor( pAcceptor ),
   m_bEncryptionInitialized( false )
 {
@@ -42,7 +41,7 @@ Lobby::GameConnection::~GameConnection()
 // overwrite the parents onConnect for our game socket needs
 void Lobby::GameConnection::onAccept( const std::string& host, uint16_t port )
 {
-  auto connection = make_GameConnection( m_hive, m_pAcceptor, m_pFw );
+  auto connection = make_GameConnection( m_hive, m_pAcceptor );
   m_pAcceptor->accept( connection );
 
   Logger::info( "Connect from {0}", m_socket.remote_endpoint().address().to_string() );
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index fbed9386..a98c01c5 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -41,7 +41,7 @@ namespace Sapphire::Lobby
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( Network::HivePtr pHive, Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
+    GameConnection( Network::HivePtr pHive, Network::AcceptorPtr pAcceptor );
 
     ~GameConnection();
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index 1ad5e068..97a252fa 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -64,9 +64,8 @@ namespace Sapphire::Lobby
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = make_Framework();
     auto hive = Network::make_Hive();
-    Network::addServerToHive< GameConnection >( m_ip, m_port, hive, pFw );
+    Network::addServerToHive< GameConnection >( m_ip, m_port, hive );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index db366d35..13b6b489 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -29,7 +29,6 @@ TYPE_FORWARD( ItemContainer );
 TYPE_FORWARD( ZonePosition );
 TYPE_FORWARD( Land );
 TYPE_FORWARD( Linkshell );
-TYPE_FORWARD( Framework );
 
 namespace World
 {