diff --git a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
index cc0fc9d4a4..d8b5217859 100644
--- a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
@@ -13,12 +13,6 @@ namespace Microsoft.AspNet.Server.WebListener
 {
     internal static class LogHelper
     {
-        private static readonly Func<object, Exception, string> LogState =
-            (state, error) => Convert.ToString(state, CultureInfo.CurrentCulture);
-
-        private static readonly Func<object, Exception, string> LogStateAndError =
-            (state, error) => string.Format(CultureInfo.CurrentCulture, "{0}\r\n{1}", state, error);
-
         internal static ILogger CreateLogger(ILoggerFactory factory, Type type)
         {
             if (factory == null)
diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
index ef06a65e13..2d134135f2 100644
--- a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
@@ -47,10 +47,10 @@ namespace Microsoft.AspNet.Server.WebListener
         /// </summary>
         /// <param name="properties"></param>
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Disposed by caller")]
-        public IServerInformation Initialize(IConfiguration config)
+        public IServerInformation Initialize(IConfiguration configuration)
         {
             OwinWebListener listener = new OwinWebListener();
-            ParseAddresses(config, listener);
+            ParseAddresses(configuration, listener);
             return new WebListenerWrapper(listener, _loggerFactory);
         }
 
diff --git a/src/Microsoft.AspNet.Server.WebListener/WebListenerWrapper.cs b/src/Microsoft.AspNet.Server.WebListener/WebListenerWrapper.cs
index 8f32b84abe..3785978504 100644
--- a/src/Microsoft.AspNet.Server.WebListener/WebListenerWrapper.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/WebListenerWrapper.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Abstractions;
@@ -44,7 +45,7 @@ namespace Microsoft.AspNet.Server.WebListener
         // Microsoft.AspNet.Server.WebListener
         public string Name
         {
-            get { return System.Reflection.IntrospectionExtensions.GetTypeInfo(GetType()).Assembly.GetName().Name; }
+            get { return GetType().GetTypeInfo().Assembly.GetName().Name; }
         }
 
         internal void Start(AppFunc app)
diff --git a/src/Microsoft.AspNet.Server.WebListener/fx/IServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/fx/IServerFactory.cs
index 42495b42f8..d428778aad 100644
--- a/src/Microsoft.AspNet.Server.WebListener/fx/IServerFactory.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/fx/IServerFactory.cs
@@ -1,16 +1,16 @@
 /* TODO: Take a temp dependency on Ms.Aspnet.Hosting until AssemblyNeutral gets fixed.
 using System;
 using System.Threading.Tasks;
-using Microsoft.Net.Runtime;
+using Microsoft.AspNet.Abstractions;
+using Microsoft.AspNet.ConfigurationModel;
 
 namespace Microsoft.AspNet.Hosting.Server
 {
-    [AssemblyNeutral]
+    // TODO: [AssemblyNeutral]
     public interface IServerFactory
     {
-        // IServerConfiguration CreateConfiguration();
-        // IDisposable Start(IServerConfiguration serverConfig, Func<object, Task> app);
-        IDisposable Start(Func<object, Task> app);
+        IServerInformation Initialize(IConfiguration configuration);
+        IDisposable Start(IServerInformation serverInformation, Func<object, Task> application);
     }
 }
 */
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/RequestTests.cs b/test/Microsoft.AspNet.Server.WebListener.Test/RequestTests.cs
index 7cfe0f4f1a..be4ec471b1 100644
--- a/test/Microsoft.AspNet.Server.WebListener.Test/RequestTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.Test/RequestTests.cs
@@ -150,8 +150,8 @@ namespace Microsoft.AspNet.Server.WebListener.Test
 
         private IDisposable CreateServer(AppFunc app)
         {
-            ServerFactory factory = new ServerFactory(null);
-            WebListenerWrapper wrapper = (WebListenerWrapper)factory.Initialize(null);
+            var factory = new ServerFactory(null);
+            var wrapper = (WebListenerWrapper)factory.Initialize(null);
 
             foreach (string path in new[] { "/", "/11", "/2/3", "/2", "/11/2" })
             {
diff --git a/test/Microsoft.AspNet.Server.WebListener.Test/ServerTests.cs b/test/Microsoft.AspNet.Server.WebListener.Test/ServerTests.cs
index ecbbc5c68a..db6497f4b1 100644
--- a/test/Microsoft.AspNet.Server.WebListener.Test/ServerTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.Test/ServerTests.cs
@@ -191,8 +191,8 @@ namespace Microsoft.AspNet.Server.WebListener.Test
         [Fact]
         public async Task Server_SetQueueLimit_Success()
         {
-            ServerFactory factory = new ServerFactory(null);
-            WebListenerWrapper wrapper = (WebListenerWrapper)factory.Initialize(null);
+            var factory = new ServerFactory(null);
+            var wrapper = (WebListenerWrapper)factory.Initialize(null);
             wrapper.Listener.UriPrefixes.Add(Prefix.Create("http://localhost:8080"));
 
             wrapper.Listener.SetRequestQueueLimit(1001);