diff --git a/include/Engine/Network/Client.h b/include/Engine/Network/Client.h
index b7bd9b38..a5488210 100644
--- a/include/Engine/Network/Client.h
+++ b/include/Engine/Network/Client.h
@@ -23,7 +23,6 @@ public:
     ~Client();
     void Start(World* world, EventBroker* eventBroker) override;
     void Update() override;
-    void Close();
 private:
     // Assio UDP logic
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
@@ -49,7 +48,6 @@ private:
     // Network logic
     PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
     SnapshotDefinitions m_NextSnapshot;
-    bool m_ThreadIsRunning = true;
     double m_DurationOfPingTime;
     std::clock_t m_StartPingTime;
     // Use to check if we should send disconnect message
diff --git a/include/Engine/Network/Network.h b/include/Engine/Network/Network.h
index 8a50f061..cb86b941 100644
--- a/include/Engine/Network/Network.h
+++ b/include/Engine/Network/Network.h
@@ -14,7 +14,6 @@ public:
     virtual ~Network() { };
     virtual void Start(World* m_world, EventBroker *eventBroker) = 0;
     virtual void Update() = 0;
-    virtual void Close() = 0;
 };
 
 #endif
\ No newline at end of file
diff --git a/include/Engine/Network/Server.h b/include/Engine/Network/Server.h
index 58ee2631..893eed0b 100644
--- a/include/Engine/Network/Server.h
+++ b/include/Engine/Network/Server.h
@@ -20,8 +20,6 @@ public:
     ~Server();
     void Start(World* m_world, EventBroker *eventBroker) override;
     void Update() override;
-    void Close();
-
 private:
     // UDP logic
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
@@ -55,9 +53,6 @@ private:
     unsigned int m_PacketID;
     unsigned int m_PreviousPacketID;
     unsigned int m_SendPacketID;
-    
-    // Close logic
-    bool m_ThreadIsRunning = true;
 
     // Private member functions
     int  receive(char* data, size_t length);
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index e682297e..b8849ed0 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -17,7 +17,6 @@ Client::Client(ConfigFile* config) : m_Socket(m_IOService)
 
 Client::~Client()
 {
-    m_EventBroker->Unsubscribe(m_EInputCommand);
 }
 
 void Client::Start(World* world, EventBroker* eventBroker)
@@ -38,14 +37,6 @@ void Client::Update()
     readFromServer();
 }
 
-void Client::Close()
-{
-    disconnect();
-    m_ThreadIsRunning = false;
-    m_Socket.close();
-    m_EventBroker->Unsubscribe(m_EInputCommand);
-}
-
 void Client::readFromServer()
 {
     while (m_Socket.available()) {
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index 837a77d6..07fed65b 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -24,12 +24,6 @@ void Server::Update()
     readFromClients();
 }
 
-void Server::Close()
-{
-    m_ThreadIsRunning = false;
-    m_Socket.close();
-}
-
 void Server::readFromClients()
 {
     while (m_Socket.available()) {