diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs
index a4213e6341..1c4aed6f8a 100644
--- a/samples/MvcSample.Web/Startup.cs
+++ b/samples/MvcSample.Web/Startup.cs
@@ -31,32 +31,33 @@ namespace MvcSample.Web
             {
                 app.UseMiddleware<MonitoringMiddlware>();
 
-                var services = new ServiceCollection();
+                app.UseServices(services =>
+                {
+                    services.AddMvc();
+                    services.AddSingleton<PassThroughAttribute>();
+                    services.AddSingleton<UserNameService>();
+                    services.AddTransient<ITestService, TestService>();
 
-                services.AddMvc();
-                services.AddSingleton<PassThroughAttribute>();
-                services.AddSingleton<UserNameService>();
-                services.AddTransient<ITestService, TestService>();
-                services.Add(OptionsServices.GetDefaultServices());
-                // Setup services with a test AssemblyProvider so that only the
-                // sample's assemblies are loaded. This prevents loading controllers from other assemblies
-                // when the sample is used in the Functional Tests.
-                services.AddTransient<IControllerAssemblyProvider, TestAssemblyProvider<Startup>>();
+                    // Setup services with a test AssemblyProvider so that only the
+                    // sample's assemblies are loaded. This prevents loading controllers from other assemblies
+                    // when the sample is used in the Functional Tests.
+                    services.AddTransient<IControllerAssemblyProvider, TestAssemblyProvider<Startup>>();
 
-                // Create the autofac container 
-                ContainerBuilder builder = new ContainerBuilder();
+                    // Create the autofac container 
+                    ContainerBuilder builder = new ContainerBuilder();
 
-                // Create the container and use the default application services as a fallback 
-                AutofacRegistration.Populate(
-                    builder,
-                    services,
-                    fallbackServiceProvider: app.ApplicationServices);
+                    // Create the container and use the default application services as a fallback 
+                    AutofacRegistration.Populate(
+                        builder,
+                        services,
+                        fallbackServiceProvider: app.ApplicationServices);
 
-                builder.RegisterModule<MonitoringModule>();
+                    builder.RegisterModule<MonitoringModule>();
 
-                IContainer container = builder.Build();
+                    IContainer container = builder.Build();
 
-                app.UseServices(container.Resolve<IServiceProvider>());
+                    return container.Resolve<IServiceProvider>();
+                });
             }
             else
 #endif
diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json
index 5c7d99d75a..795c803d5d 100644
--- a/samples/MvcSample.Web/project.json
+++ b/samples/MvcSample.Web/project.json
@@ -13,31 +13,19 @@
     "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
     "Microsoft.AspNet.StaticFiles": "1.0.0-*",
     "Microsoft.DataAnnotations": "1.0.0-*",
-    "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
-    "Microsoft.Framework.DependencyInjection": "1.0.0-*",
-    "Microsoft.Framework.OptionsModel": "1.0.0-*"
+    "Microsoft.Framework.ConfigurationModel": "1.0.0-*"
   },
   "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
   "frameworks": {
     "aspnet50": {
       "dependencies": {
-        "System.ComponentModel.DataAnnotations": "",
         "Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*",
         "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
         "Autofac": "3.3.0"
       }
     },
     "aspnetcore50": {
-      "dependencies": {
-        "System.ComponentModel": "4.0.0.0",
-        "System.Console": "4.0.0.0",
-        "System.Diagnostics.Debug": "4.0.10.0",
-        "System.Diagnostics.Tools": "4.0.0.0",
-        "System.Dynamic.Runtime": "4.0.0.0",
-        "System.Runtime": "4.0.20.0",
-        "System.Runtime.InteropServices": "4.0.20.0",
-        "System.Threading.Tasks": "4.0.10.0"
-      }
+      "dependencies": { }
     }
   }
 }
diff --git a/samples/MvcSample.Web/web.Debug.config b/samples/MvcSample.Web/web.Debug.config
deleted file mode 100644
index 2e302f9f95..0000000000
--- a/samples/MvcSample.Web/web.Debug.config
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of 
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
-    finds an attribute "name" that has a value of "MyDB".
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <!--
-      In the example below, the "Replace" transform will replace the entire 
-      <customErrors> section of your web.config file.
-      Note that because there is only one customErrors section under the 
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
\ No newline at end of file
diff --git a/samples/MvcSample.Web/web.Release.config b/samples/MvcSample.Web/web.Release.config
deleted file mode 100644
index c35844462b..0000000000
--- a/samples/MvcSample.Web/web.Release.config
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of 
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
-    finds an attribute "name" that has a value of "MyDB".
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
-    <!--
-      In the example below, the "Replace" transform will replace the entire 
-      <customErrors> section of your web.config file.
-      Note that because there is only one customErrors section under the 
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
\ No newline at end of file
diff --git a/samples/MvcSample.Web/web.config b/samples/MvcSample.Web/web.config
deleted file mode 100644
index 04274d15b2..0000000000
--- a/samples/MvcSample.Web/web.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <appSettings>
-        <add key="K" value="false" />
-    </appSettings>
-    <system.web>
-      <compilation debug="true" targetFramework="4.5" />
-      <httpRuntime targetFramework="4.5" />
-    </system.web>
-
-</configuration>