diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
index 496d6990c1..6cd3f1d718 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
@@ -88,7 +88,7 @@ final class SocketTestPermutation {
         bfs.add(new Factory<Bootstrap>() {
             @Override
             public Bootstrap newInstance() {
-                return new Bootstrap().group(new NioEventLoopGroup()).channelFactory(new ChannelFactory() {
+                return new Bootstrap().group(new NioEventLoopGroup()).channelFactory(new ChannelFactory<Channel>() {
                     @Override
                     public Channel newChannel() {
                        return new NioDatagramChannel(InternetProtocolFamily.IPv4);
diff --git a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtProvider.java b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtProvider.java
index da212a40d5..9333c28cfe 100644
--- a/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtProvider.java
+++ b/transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtProvider.java
@@ -27,8 +27,6 @@ import io.netty.bootstrap.ChannelFactory;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
 import io.netty.channel.udt.UdtChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.nio.channels.spi.SelectorProvider;
@@ -40,23 +38,20 @@ import java.nio.channels.spi.SelectorProvider;
  * <p>
  * Provides {@link SelectorProvider} for UDT channels.
  */
-public final class NioUdtProvider implements ChannelFactory {
-
-    private static final InternalLogger logger = InternalLoggerFactory
-            .getInstance(NioUdtProvider.class);
+public final class NioUdtProvider implements ChannelFactory<UdtChannel> {
 
     /**
      * {@link ChannelFactory} for UDT Byte Acceptor. See {@link TypeUDT#STREAM}
      * and {@link KindUDT#ACCEPTOR}.
      */
-    public static final ChannelFactory BYTE_ACCEPTOR = new NioUdtProvider(
+    public static final ChannelFactory<UdtChannel> BYTE_ACCEPTOR = new NioUdtProvider(
             TypeUDT.STREAM, KindUDT.ACCEPTOR);
 
     /**
      * {@link ChannelFactory} for UDT Byte Connector. See {@link TypeUDT#STREAM}
      * and {@link KindUDT#CONNECTOR}.
      */
-    public static final ChannelFactory BYTE_CONNECTOR = new NioUdtProvider(
+    public static final ChannelFactory<UdtChannel> BYTE_CONNECTOR = new NioUdtProvider(
             TypeUDT.STREAM, KindUDT.CONNECTOR);
 
     /**
@@ -69,21 +64,21 @@ public final class NioUdtProvider implements ChannelFactory {
      * {@link ChannelFactory} for UDT Byte Rendezvous. See
      * {@link TypeUDT#STREAM} and {@link KindUDT#RENDEZVOUS}.
      */
-    public static final ChannelFactory BYTE_RENDEZVOUS = new NioUdtProvider(
+    public static final ChannelFactory<UdtChannel> BYTE_RENDEZVOUS = new NioUdtProvider(
             TypeUDT.STREAM, KindUDT.RENDEZVOUS);
 
     /**
      * {@link ChannelFactory} for UDT Message Acceptor. See
      * {@link TypeUDT#DATAGRAM} and {@link KindUDT#ACCEPTOR}.
      */
-    public static final ChannelFactory MESSAGE_ACCEPTOR = new NioUdtProvider(
+    public static final ChannelFactory<UdtChannel> MESSAGE_ACCEPTOR = new NioUdtProvider(
             TypeUDT.DATAGRAM, KindUDT.ACCEPTOR);
 
     /**
      * {@link ChannelFactory} for UDT Message Connector. See
      * {@link TypeUDT#DATAGRAM} and {@link KindUDT#CONNECTOR}.
      */
-    public static final ChannelFactory MESSAGE_CONNECTOR = new NioUdtProvider(
+    public static final ChannelFactory<UdtChannel> MESSAGE_CONNECTOR = new NioUdtProvider(
             TypeUDT.DATAGRAM, KindUDT.CONNECTOR);
 
     /**
@@ -96,7 +91,7 @@ public final class NioUdtProvider implements ChannelFactory {
      * {@link ChannelFactory} for UDT Message Rendezvous. See
      * {@link TypeUDT#DATAGRAM} and {@link KindUDT#RENDEZVOUS}.
      */
-    public static final ChannelFactory MESSAGE_RENDEZVOUS = new NioUdtProvider(
+    public static final ChannelFactory<UdtChannel> MESSAGE_RENDEZVOUS = new NioUdtProvider(
             TypeUDT.DATAGRAM, KindUDT.RENDEZVOUS);
 
     /**
diff --git a/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java b/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java
index 3792b2795c..292eb6efa6 100644
--- a/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java
+++ b/transport/src/main/java/io/netty/bootstrap/ChannelFactory.java
@@ -26,4 +26,4 @@ public interface ChannelFactory<T extends Channel> {
      * Creates a new channel.
      */
     T newChannel();
-}
\ No newline at end of file
+}