diff --git a/include/Engine/Network/HybridClient.h b/include/Engine/Network/HybridClient.h
deleted file mode 100644
index 8d96bf6e..00000000
--- a/include/Engine/Network/HybridClient.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef HybridClient_h__
-#define HybridClient_h__
-
-class HybridClient
-{
-public:
-    HybridClient();
-    ~HybridClient();
-private:
-
-};
-
-#endif
\ No newline at end of file
diff --git a/include/Engine/Network/HybridServer.h b/include/Engine/Network/HybridServer.h
deleted file mode 100644
index 48d6fe63..00000000
--- a/include/Engine/Network/HybridServer.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef HybridServer_h__
-#define HybridServer_h__
-
-class HybridServer
-{
-public:
-    HybridServer();
-    ~HybridServer();
-private:
-};
-
-#endif
\ No newline at end of file
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index fc5b68e1..213e1815 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -203,7 +203,6 @@ void Client::parseServerlist(Packet& packet)
     std::string serverName = packet.ReadString();
     int playersConnected = packet.ReadPrimitive<int>();
     //TODO: This should not happen when a client is connected to a server
-    LOG_INFO("Parsing a server list!");
 
     m_Serverlist.push_back({ address, port, serverName, playersConnected });
 }
diff --git a/src/Engine/Network/HybridClient.cpp b/src/Engine/Network/HybridClient.cpp
deleted file mode 100644
index 4200e8e3..00000000
--- a/src/Engine/Network/HybridClient.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "Network/HybridClient.h"
-
-
-HybridClient::HybridClient()
-{
-}
-
-HybridClient::~HybridClient()
-{
-}
\ No newline at end of file
diff --git a/src/Engine/Network/HybridServer.cpp b/src/Engine/Network/HybridServer.cpp
deleted file mode 100644
index bfcdaee0..00000000
--- a/src/Engine/Network/HybridServer.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "Network/HybridServer.h"
-
-HybridServer::HybridServer()
-{ 
-}
-
-HybridServer::~HybridServer()
-{
-}
\ No newline at end of file
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index 157f74dd..8783a7b0 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -399,10 +399,7 @@ void Server::parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint)
     packet.WritePrimitive<int>(m_Reliable.Port());
     packet.WriteString("SERVERNAME");
     packet.WritePrimitive<int>(m_ConnectedPlayers.size());
-    //PlayerDefinition pDef;
-    //pDef.Endpoint = boost::asio::ip::udp::endpoint(endpoint.address(), 13);
-    LOG_INFO("Parsing a server list request!");
-    m_ServerlistRequest.Send(packet/*, endpoint*/);
+    m_ServerlistRequest.Send(packet);
 }
 
 void Server::disconnect(PlayerID playerID)
diff --git a/src/Engine/Network/TCPClient.cpp b/src/Engine/Network/TCPClient.cpp
index f2920ae5..f3394d3d 100644
--- a/src/Engine/Network/TCPClient.cpp
+++ b/src/Engine/Network/TCPClient.cpp
@@ -64,26 +64,6 @@ void TCPClient::Receive(Packet& packet)
 
 size_t TCPClient::readBuffer()
 { 
-    //if (!m_Socket) {
-    //    return 0;
-    //}
-    //boost::system::error_code error;
-    //// Read size of packet
-    //size_t bytesReceived = m_Socket->read_some(boost
-    //    ::asio::buffer((void*)data, sizeof(int)),
-    //    error);
-    //int sizeOfPacket = 0;
-    //memcpy(&sizeOfPacket, data, sizeof(int));
-
-    //// Read the rest of the message
-    //bytesReceived += m_Socket->read_some(boost
-    //    ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
-    //    error);
-    //if (error) {
-    //    //LOG_ERROR("receive: %s", error.message().c_str());
-    //}
-    //return bytesReceived;
-
     if (!m_Socket) {
         return 0;
     }
diff --git a/src/Engine/Network/TCPServer.cpp b/src/Engine/Network/TCPServer.cpp
index ac2ba655..24a0b2c1 100644
--- a/src/Engine/Network/TCPServer.cpp
+++ b/src/Engine/Network/TCPServer.cpp
@@ -91,38 +91,6 @@ std::string TCPServer::GetAddress()
     return endpoint.address().to_string().c_str();
 }
 
-//void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
-//{
-//    int bytesRead = readBuffer(m_ReadBuffer, playerDefinition);
-//    if (bytesRead > 0) {
-//        packet.ReconstructFromData(m_ReadBuffer, bytesRead);
-//    }
-//    lastReceivedSocket = playerDefinition.TCPSocket;
-//}
-//
-//int TCPServer::readBuffer(char* data, PlayerDefinition & playerDefinition)
-//{
-//    if (!playerDefinition.TCPSocket) {
-//        return 0;
-//    }
-//    boost::system::error_code error;
-//    // Read size of packet
-//    size_t bytesReceived = playerDefinition.TCPSocket->read_some(boost
-//        ::asio::buffer((void*)data, sizeof(int)),
-//        error);
-//    int sizeOfPacket = 0;
-//    memcpy(&sizeOfPacket, data, sizeof(int));
-//
-//    // Read the rest of the message
-//    bytesReceived += playerDefinition.TCPSocket->read_some(boost
-//        ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
-//        error);
-//    if (error) {
-//        //LOG_ERROR("receive: %s", error.message().c_str());
-//    }
-//    return bytesReceived;
-//}
-
 void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
 {
     int bytesRead = readBuffer(playerDefinition);
diff --git a/src/Engine/Network/UDPClient.cpp b/src/Engine/Network/UDPClient.cpp
index 37b9b1a0..51c29920 100644
--- a/src/Engine/Network/UDPClient.cpp
+++ b/src/Engine/Network/UDPClient.cpp
@@ -35,18 +35,6 @@ void UDPClient::Receive(Packet& packet)
 
 int UDPClient::readBuffer()
 {
-    //if (!m_Socket) {
-    //    return 0;
-    //}
-    //boost::system::error_code error;
-    //int bytesReceived = m_Socket->receive_from(boost
-    //    ::asio::buffer((void*)data, BUFFERSIZE),
-    //    m_ReceiverEndpoint,
-    //    0, error);
-    //if (error) {
-    //    //LOG_ERROR("receive: %s", error.message().c_str());
-    //}
-    //return bytesReceived;
     if (!m_Socket) {
         return 0;
     }
diff --git a/src/Engine/Network/UDPServer.cpp b/src/Engine/Network/UDPServer.cpp
index 2f941b04..635ebd4d 100644
--- a/src/Engine/Network/UDPServer.cpp
+++ b/src/Engine/Network/UDPServer.cpp
@@ -70,7 +70,6 @@ void UDPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
     if (bytesRead > 0) {
         packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
-    LOG_INFO("Received server list msg");
     playerDefinition.Endpoint = m_ReceiverEndpoint;
 }
 
@@ -81,15 +80,6 @@ bool UDPServer::IsSocketAvailable()
 
 int UDPServer::readBuffer()
 {
-    //boost::system::error_code error = boost::asio::error::host_not_found;
-    //unsigned int length = m_Socket->receive_from(
-    //    boost::asio::buffer((void*)data
-    //        , BUFFERSIZE)
-    //    , m_ReceiverEndpoint, 0, error);
-    //if (error) {
-    //    LOG_WARNING(error.message().c_str());
-    //}
-    //return length;
     if (!m_Socket) {
         return 0;
     }