diff --git a/src/main/java/mc/server/config/NetworkModule.java b/src/main/java/mc/server/config/NetworkModule.java
index 2fd4a47..19c4b70 100644
--- a/src/main/java/mc/server/config/NetworkModule.java
+++ b/src/main/java/mc/server/config/NetworkModule.java
@@ -1,7 +1,6 @@
 package mc.server.config;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Injector;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
@@ -50,31 +49,16 @@ public class NetworkModule extends AbstractModule {
         return bootstrap;
     }
 
-    @Provides
-    PacketSplitter packetSplitter() {
-        return new PacketSplitter(new ProtocolSplitter());
-    }
-
-    @Provides
-    PacketDecoder packetDecoder() {
-        return new PacketDecoder(new ProtocolDecoder(PacketDirection.SERVER_BOUND));
-    }
-
-    @Provides
-    PacketEncoder packetEncoder() {
-        return new PacketEncoder(new ProtocolEncoder(PacketDirection.CLIENT_BOUND));
-    }
-
     @Provides
     @Named("channelHandlerMap")
-    Map<String, ChannelHandler> channelHandlerMap(final Injector injector) {
+    Map<String, ChannelHandler> channelHandlerMap(HandshakeHandler handshakeHandler) {
         final Map<String, ChannelHandler> map = new HashMap<>();
 
-        map.put("logger", injector.getInstance(LoggingHandler.class));
-        map.put("packet_splitter", injector.getInstance(PacketSplitter.class));
-        map.put("packet_decoder", injector.getInstance(PacketDecoder.class));
-        map.put("packet_encoder", injector.getInstance(PacketEncoder.class));
-        map.put("handshake_handler", injector.getInstance(HandshakeHandler.class));
+        map.put("logger", new LoggingHandler());
+        map.put("packet_splitter", new PacketSplitter(new ProtocolSplitter()));
+        map.put("packet_decoder", new PacketDecoder(new ProtocolDecoder(PacketDirection.SERVER_BOUND)));
+        map.put("packet_encoder", new PacketEncoder(new ProtocolEncoder(PacketDirection.CLIENT_BOUND)));
+        map.put("handshake_handler", handshakeHandler);
 
         return map;
     }