diff --git a/proxy/src/main/java/net/md_5/bungee/netty/OutboundBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/OutboundBoss.java
deleted file mode 100644
index fcf9cf32..00000000
--- a/proxy/src/main/java/net/md_5/bungee/netty/OutboundBoss.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.md_5.bungee.netty;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelOperationHandlerAdapter;
-import io.netty.channel.ChannelPromise;
-import java.nio.channels.ClosedChannelException;
-
-public class OutboundBoss extends ChannelOperationHandlerAdapter
-{
-
-    @Override
-    public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception
-    {
-        ctx.flush( promise );
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
-    {
-        if ( !( cause instanceof ClosedChannelException ) )
-        {
-            ctx.fireExceptionCaught( cause );
-        }
-    }
-}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 5a209b6f..ae432017 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -44,7 +44,6 @@ public class PipelineUtils
     public static final Base BASE = new Base();
     private static final DefinedPacketEncoder packetEncoder = new DefinedPacketEncoder();
     private static final ByteArrayEncoder arrayEncoder = new ByteArrayEncoder();
-    public static String OUTBOUND_BOSS_HANDLER = "outbound-boss";
     public static String TIMEOUT_HANDLER = "timeout";
     public static String PACKET_DECODE_HANDLER = "packet-decoder";
     public static String PACKET_ENCODE_HANDLER = "packet-encoder";
@@ -67,7 +66,6 @@ public class PipelineUtils
                 // IP_TOS is not supported (Windows XP / Windows Server 2003)
             }
 
-            ch.pipeline().addLast( OUTBOUND_BOSS_HANDLER, new OutboundBoss() );
             ch.pipeline().addLast( TIMEOUT_HANDLER, new ReadTimeoutHandler( BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS ) );
             ch.pipeline().addLast( PACKET_DECODE_HANDLER, new PacketDecoder( Vanilla.getInstance() ) );
             ch.pipeline().addLast( PACKET_ENCODE_HANDLER, packetEncoder );