diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/IListener.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/IListener.cs
deleted file mode 100644
index ccd6d104d4..0000000000
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/IListener.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNet.Server.Kestrel.Http
-{
-    /// <summary>
-    /// A listener waits for incoming connections on a specified socket.
-    /// </summary>
-    public interface IListener : IDisposable
-    {
-        Task StartAsync(
-            string scheme,
-            string host,
-            int port,
-            KestrelThread thread,
-            Func<Frame, Task> application);
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/IListenerPrimary.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/IListenerPrimary.cs
deleted file mode 100644
index 7a42fe02ef..0000000000
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/IListenerPrimary.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNet.Server.Kestrel.Http
-{
-    /// <summary>
-    /// A primary listener waits for incoming connections on a specified socket. Incoming 
-    /// connections may be passed to a secondary listener to handle.
-    /// </summary>
-    public interface IListenerPrimary : IListener
-    {
-        Task StartAsync(
-            string pipeName,
-            string scheme,
-            string host,
-            int port,
-            KestrelThread thread,
-            Func<Frame, Task> application);
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/IListenerSecondary.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/IListenerSecondary.cs
deleted file mode 100644
index 3230a7e1bc..0000000000
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/IListenerSecondary.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNet.Server.Kestrel.Http
-{
-    /// <summary>
-    /// A secondary listener is delegated requests from a primary listener via a named pipe or 
-    /// UNIX domain socket.
-    /// </summary>
-    public interface IListenerSecondary : IDisposable
-    {
-        Task StartAsync(
-            string pipeName,
-            KestrelThread thread,
-            Func<Frame, Task> application);
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs
index 55d8d8dc93..b59e7253c1 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
     /// <summary>
     /// Base class for listeners in Kestrel. Listens for incoming connections
     /// </summary>
-    public abstract class Listener : ListenerContext, IListener
+    public abstract class Listener : ListenerContext, IDisposable
     {
         protected UvStreamHandle ListenSocket { get; private set; }
 
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerPrimary.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerPrimary.cs
index df4fdb09fa..6df605409d 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerPrimary.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerPrimary.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
     /// A primary listener waits for incoming connections on a specified socket. Incoming 
     /// connections may be passed to a secondary listener to handle.
     /// </summary>
-    abstract public class ListenerPrimary : Listener, IListenerPrimary
+    abstract public class ListenerPrimary : Listener
     {
         UvPipeHandle ListenPipe { get; set; }
 
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs
index 1ca3c9b193..71919b0035 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
     /// A secondary listener is delegated requests from a primary listener via a named pipe or 
     /// UNIX domain socket.
     /// </summary>
-    public abstract class ListenerSecondary : ListenerContext, IListenerSecondary
+    public abstract class ListenerSecondary : ListenerContext, IDisposable
     {
         UvPipeHandle DispatchPipe { get; set; }
 
diff --git a/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs b/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs
index 6d5782d54b..61331e9798 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/KestrelEngine.cs
@@ -117,7 +117,7 @@ namespace Microsoft.AspNet.Server.Kestrel
                     if (single)
                     {
                         var listener = usingPipes ? 
-                            (IListener) new PipeListener(Memory) : 
+                            (Listener) new PipeListener(Memory) : 
                             new TcpListener(Memory);
                         listeners.Add(listener);
                         listener.StartAsync(scheme, host, port, thread, application).Wait();
@@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Server.Kestrel
                     else if (first)
                     {
                         var listener = usingPipes
-                            ? (IListenerPrimary) new PipeListenerPrimary(Memory)
+                            ? (ListenerPrimary) new PipeListenerPrimary(Memory)
                             : new TcpListenerPrimary(Memory);
 
                         listeners.Add(listener);
@@ -134,7 +134,7 @@ namespace Microsoft.AspNet.Server.Kestrel
                     else
                     {
                         var listener = usingPipes
-                            ? (IListenerSecondary) new PipeListenerSecondary(Memory)
+                            ? (ListenerSecondary) new PipeListenerSecondary(Memory)
                             : new TcpListenerSecondary(Memory);
                         listeners.Add(listener);
                         listener.StartAsync(pipeName, thread, application).Wait();