diff --git a/samples/MvcSample.Web/MvcSample.Web.kproj b/samples/MvcSample.Web/MvcSample.Web.kproj
index bb973e66dd..4ba2a5664d 100644
--- a/samples/MvcSample.Web/MvcSample.Web.kproj
+++ b/samples/MvcSample.Web/MvcSample.Web.kproj
@@ -22,54 +22,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>42750</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="App_Data\Config.json" />
-    <Content Include="Areas\Travel\Views\Flight\Fly.cshtml" />
-    <Content Include="Content\bootstrap.min.css" />
-    <Content Include="project.json" />
-    <Content Include="Views\Home\Create.cshtml" />
-    <Content Include="Views\Home\EditorTemplates\IEnumerable`1.cshtml" />
-    <Content Include="Views\Home\InjectSample.cshtml" />
-    <Content Include="Views\Home\Test.cshtml" />
-    <Content Include="Views\Home\ValidationSummary.cshtml" />
-    <Content Include="Views\Link\Details.cshtml" />
-    <Content Include="Views\Shared\Components\Tags\Default.cshtml" />
-    <Content Include="Views\Shared\DisplayTemplates\Decimal.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Decimal.cshtml" />
-    <Content Include="Views\Shared\HelloWorldPartial.cshtml" />
-    <Content Include="Views\Shared\MyView.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
-    <Content Include="Views\_ViewStart.cshtml" />
-    <Content Include="web.config" />
-    <Content Include="web.Debug.config" />
-    <Content Include="web.Release.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Areas\Travel\Controllers\Flight.cs" />
-    <Compile Include="Areas\Travel\Controllers\HomeController.cs" />
-    <Compile Include="Components\TagCloud.cs" />
-    <Compile Include="FiltersController.cs" />
-    <Compile Include="Filters\AgeEnhancerFilterAttribute.cs" />
-    <Compile Include="Filters\BlockAnonymous.cs" />
-    <Compile Include="Filters\DelayAttribute.cs" />
-    <Compile Include="Filters\FakeUserAttribute.cs" />
-    <Compile Include="Filters\ErrorMessagesAttribute.cs" />
-    <Compile Include="Filters\InspectResultPageAttribute.cs" />
-    <Compile Include="Filters\PassThroughAttribute.cs" />
-    <Compile Include="Filters\UserNameProvider.cs" />
-    <Compile Include="Filters\UserNameService.cs" />
-    <Compile Include="Home2Controller.cs" />
-    <Compile Include="HomeController.cs" />
-    <Compile Include="LinkController.cs" />
-    <Compile Include="Models\User.cs" />
-    <Compile Include="Monitoring\MonitoringMiddlware.cs" />
-    <Compile Include="Monitoring\MonitoringModule.cs" />
-    <Compile Include="OverloadController.cs" />
-    <Compile Include="Services\TestService.cs" />
-    <Compile Include="SimplePocoController.cs" />
-    <Compile Include="SimpleRest.cs" />
-    <Compile Include="Startup.cs" />
-    <Compile Include="ViewMetadata.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj b/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj
index caf1d98985..749ca3c203 100644
--- a/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj
+++ b/src/Microsoft.AspNet.Mvc.Common/Microsoft.AspNet.Mvc.Common.kproj
@@ -16,16 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Encodings.cs" />
-    <Compile Include="NotNullArgument.cs" />
-    <Compile Include="PlatformHelper.cs" />
-    <Compile Include="PropertyActivator.cs" />
-    <Compile Include="PropertyHelper.cs" />
-    <Compile Include="TypeExtensions.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj b/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj
index c132206cfd..a93dd93546 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj
+++ b/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj
@@ -16,295 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Resources.resx">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AcceptVerbsAttribute.cs" />
-    <Compile Include="ActionContext.cs" />
-    <Compile Include="ActionConvention.cs" />
-    <Compile Include="ActionDescriptor.cs" />
-    <Compile Include="ActionDescriptorProviderContext.cs" />
-    <Compile Include="ActionDescriptorsCollection.cs" />
-    <Compile Include="ActionResults\HttpNotFoundResult.cs" />
-    <Compile Include="Formatters\TextPlainFormatter.cs" />
-    <Compile Include="HttpMethodAttribute.cs" />
-    <Compile Include="Formatters\NoContentFormatter.cs" />
-    <Compile Include="Internal\DecisionTree\DecisionCriterionValue.cs" />
-    <Compile Include="Internal\DecisionTree\DecisionCriterionValueEqualityComparer.cs" />
-    <Compile Include="Logging\AttributeRouteRouteAsyncValues.cs" />
-    <Compile Include="Logging\LoggerExtensions.cs" />
-    <Compile Include="Logging\MvcRouteHandlerRouteAsyncValues.cs" />
-    <Compile Include="Logging\StringBuilderHelpers.cs" />
-    <Compile Include="Filters\ProducesAttribute.cs" />
-    <Compile Include="Formatters\DefaultOutputFormattersProvider.cs" />
-    <Compile Include="Formatters\IOutputFormatter.cs" />
-    <Compile Include="Formatters\StringWithQualityHeaderValueComparer.cs" />
-    <Compile Include="IProducesMetadataProvider.cs" />
-    <Compile Include="Formatters\IOutputFormattersProvider.cs" />
-    <Compile Include="Formatters\OutputFormatterContext.cs" />
-    <Compile Include="Formatters\HeaderParsingHelpers.cs" />
-    <Compile Include="Formatters\JsonOutputFormatter.cs" />
-    <Compile Include="Formatters\MediaTypeWithQualityHeaderValueComparer.cs" />
-    <Compile Include="Formatters\OutputFormatter.cs" />
-    <Compile Include="FilterActionInvoker.cs" />
-    <Compile Include="OptionDescriptors\DefaultModelBinderProvider.cs" />
-    <Compile Include="OptionDescriptors\DefaultValueProviderFactoryProvider.cs" />
-    <Compile Include="OptionDescriptors\DefaultViewEngineProvider.cs" />
-    <Compile Include="OptionDescriptors\ModelBinderDescriptor.cs" />
-    <Compile Include="OptionDescriptors\ModelBinderDescriptorExtensions.cs" />
-    <Compile Include="OptionDescriptors\OptionDescriptor.cs" />
-    <Compile Include="OptionDescriptors\OptionDescriptorBasedProvider.cs" />
-    <Compile Include="OptionDescriptors\OutputFormatterDescriptor.cs" />
-    <Compile Include="OptionDescriptors\OutputFormatterDescriptorExtensions.cs" />
-    <Compile Include="OptionDescriptors\ValueProviderFactoryDescriptor.cs" />
-    <Compile Include="OptionDescriptors\ValueProviderFactoryDescriptorExtensions.cs" />
-    <Compile Include="OptionDescriptors\ViewEngineDescriptor.cs" />
-    <Compile Include="OptionDescriptors\ViewEngineDescriptorExtensions.cs" />
-    <Compile Include="ParameterBinding\ModelBindingHelper.cs" />
-    <Compile Include="Internal\DecisionTree\DecisionTreeBuilder.cs" />
-    <Compile Include="Internal\DecisionTree\DecisionCriterion.cs" />
-    <Compile Include="Internal\DecisionTree\DecisionTreeNode.cs" />
-    <Compile Include="Internal\DecisionTree\IClassifier.cs" />
-    <Compile Include="Internal\DecisionTree\ItemDescriptor.cs" />
-    <Compile Include="ReflectedActionDescriptor.cs" />
-    <Compile Include="ReflectedActionDescriptorProvider.cs" />
-    <Compile Include="ReflectedActionInvoker.cs" />
-    <Compile Include="ReflectedModelBuilder\IReflectedApplicationModelConvention.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedActionModel.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedControllerModel.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedApplicationModel.cs" />
-    <Compile Include="ActionInvokerFactory.cs" />
-    <Compile Include="ActionInvokerProviderContext.cs" />
-    <Compile Include="ActionMethodSelectorAttribute.cs" />
-    <Compile Include="ActionNameAttribute.cs" />
-    <Compile Include="ActionResult.cs" />
-    <Compile Include="ActionResults\ChallengeResult.cs" />
-    <Compile Include="ActionResults\ContentResult.cs" />
-    <Compile Include="ActionResults\EmptyResult.cs" />
-    <Compile Include="ActionResults\HttpStatusCodeResult.cs" />
-    <Compile Include="ActionResults\JsonResult.cs" />
-    <Compile Include="ActionResults\NoContentResult.cs" />
-    <Compile Include="ActionResults\ObjectResult.cs" />
-    <Compile Include="ActionResults\RedirectResult.cs" />
-    <Compile Include="ActionResults\RedirectToActionResult.cs" />
-    <Compile Include="ActionResults\RedirectToRouteResult.cs" />
-    <Compile Include="ActionResults\ViewResult.cs" />
-    <Compile Include="ActivateAttribute.cs" />
-    <Compile Include="AntiForgery\AntiForgery.cs" />
-    <Compile Include="AntiForgery\AntiForgeryOptions.cs" />
-    <Compile Include="AntiForgery\AntiForgeryToken.cs" />
-    <Compile Include="AntiForgery\AntiForgeryTokenSerializer.cs" />
-    <Compile Include="AntiForgery\AntiForgeryTokenSet.cs" />
-    <Compile Include="AntiForgery\AntiForgeryTokenStore.cs" />
-    <Compile Include="AntiForgery\AntiForgeryWorker.cs" />
-    <Compile Include="AntiForgery\BinaryBlob.cs" />
-    <Compile Include="AntiForgery\DefaultClaimUidExtractor.cs" />
-    <Compile Include="AntiForgery\DefaultAntiForgeryAdditionalDataProvider.cs" />
-    <Compile Include="AntiForgery\IAntiForgeryAdditionalDataProvider.cs" />
-    <Compile Include="AntiForgery\IAntiForgeryTokenSerializer.cs" />
-    <Compile Include="AntiForgery\IClaimUidExtractor.cs" />
-    <Compile Include="AntiForgery\ITokenGenerator.cs" />
-    <Compile Include="AntiForgery\ITokenStore.cs" />
-    <Compile Include="AntiForgery\ITokenValidator.cs" />
-    <Compile Include="AntiForgery\TokenProvider.cs" />
-    <Compile Include="Areas\AreaAttribute.cs" />
-    <Compile Include="BodyParameterInfo.cs" />
-    <Compile Include="Controller.cs" />
-    <Compile Include="ControllerDescriptor.cs" />
-    <Compile Include="DefaultActionDescriptorsCollectionProvider.cs" />
-    <Compile Include="DefaultActionDiscoveryConventions.cs" />
-    <Compile Include="DefaultActionSelector.cs" />
-    <Compile Include="DefaultControllerActivator.cs" />
-    <Compile Include="DefaultControllerAssemblyProvider.cs" />
-    <Compile Include="DefaultControllerFactory.cs" />
-    <Compile Include="ExpiringFileInfoCache.cs" />
-    <Compile Include="Extensions\IEnumerableExtensions.cs" />
-    <Compile Include="Filters\FilterItemOrderComparer.cs" />
-    <Compile Include="Filters\TypeFilterAttribute.cs" />
-    <Compile Include="Filters\ActionExecutedContext.cs" />
-    <Compile Include="Filters\ActionExecutingContext.cs" />
-    <Compile Include="Filters\ActionExecutionDelegate.cs" />
-    <Compile Include="Filters\ActionFilterAttribute.cs" />
-    <Compile Include="Filters\AllowAnonymousAttribute.cs" />
-    <Compile Include="Filters\AuthorizationContext.cs" />
-    <Compile Include="Filters\AuthorizationFilterAttribute.cs" />
-    <Compile Include="Filters\AuthorizeAttribute.cs" />
-    <Compile Include="Filters\DefaultFilterProvider.cs" />
-    <Compile Include="Filters\ExceptionContext.cs" />
-    <Compile Include="Filters\ExceptionFilterAttribute.cs" />
-    <Compile Include="Filters\FilterContext.cs" />
-    <Compile Include="Filters\FilterDescriptor.cs" />
-    <Compile Include="Filters\FilterDescriptorOrderComparer.cs" />
-    <Compile Include="Filters\FilterItem.cs" />
-    <Compile Include="Filters\FilterProviderContext.cs" />
-    <Compile Include="Filters\FilterScope.cs" />
-    <Compile Include="Filters\IActionFilter.cs" />
-    <Compile Include="Filters\IAllowAnonymous.cs" />
-    <Compile Include="Filters\IAsyncActionFilter.cs" />
-    <Compile Include="Filters\IAsyncAuthorizationFilter.cs" />
-    <Compile Include="Filters\IAsyncExceptionFilter.cs" />
-    <Compile Include="Filters\IAsyncResultFilter.cs" />
-    <Compile Include="Filters\IAuthorizationFilter.cs" />
-    <Compile Include="Filters\IExceptionFilter.cs" />
-    <Compile Include="Filters\IFilter.cs" />
-    <Compile Include="Filters\IFilterContainer.cs" />
-    <Compile Include="Filters\IOrderedFilter.cs" />
-    <Compile Include="Filters\IResultFilter.cs" />
-    <Compile Include="Filters\IFilterFactory.cs" />
-    <Compile Include="Filters\ResultExecutedContext.cs" />
-    <Compile Include="Filters\ResultExecutingContext.cs" />
-    <Compile Include="Filters\ResultExecutionDelegate.cs" />
-    <Compile Include="Filters\ResultFilterAttribute.cs" />
-    <Compile Include="Filters\ServiceFilterAttribute.cs" />
-    <Compile Include="Filters\ValidateAntiForgeryTokenAttribute.cs" />
-    <Compile Include="Filters\ValidateAntiForgeryTokenAuthorizationFilter.cs" />
-    <Compile Include="FormContext.cs" />
-    <Compile Include="HttpDeleteAttribute.cs" />
-    <Compile Include="HttpGetAttribute.cs" />
-    <Compile Include="HttpMethodConstraint.cs" />
-    <Compile Include="HttpPatchAttribute.cs" />
-    <Compile Include="HttpPostAttribute.cs" />
-    <Compile Include="HttpPutAttribute.cs" />
-    <Compile Include="IActionConstraint.cs" />
-    <Compile Include="IActionDescriptorProvider.cs" />
-    <Compile Include="IActionDescriptorsCollectionProvider.cs" />
-    <Compile Include="IActionDiscoveryConventions.cs" />
-    <Compile Include="IActionInvoker.cs" />
-    <Compile Include="IActionInvokerFactory.cs" />
-    <Compile Include="IActionInvokerProvider.cs" />
-    <Compile Include="IActionResult.cs" />
-    <Compile Include="IActionSelector.cs" />
-    <Compile Include="IControllerActivator.cs" />
-    <Compile Include="IControllerAssemblyProvider.cs" />
-    <Compile Include="IControllerFactory.cs" />
-    <Compile Include="IExpiringFileInfoCache.cs" />
-    <Compile Include="Injector.cs" />
-    <Compile Include="Internal\TypeHelper.cs" />
-    <Compile Include="IUrlHelper.cs" />
-    <Compile Include="KnownRouteValueConstraint.cs" />
-    <Compile Include="Logging\DefaultActionSelectorSelectAsyncValues.cs" />
-    <Compile Include="Logging\LogFormatter.cs" />
-    <Compile Include="MvcOptions.cs" />
-    <Compile Include="MvcRouteHandler.cs" />
-    <Compile Include="NonActionAttribute.cs" />
-    <Compile Include="ParameterBindingInfo.cs" />
-    <Compile Include="ParameterBinding\ActionBindingContext.cs" />
-    <Compile Include="ParameterBinding\DefaultActionBindingContextProvider.cs" />
-    <Compile Include="ParameterBinding\FromBodyAttribute.cs" />
-    <Compile Include="ParameterBinding\IActionBindingContextProvider.cs" />
-    <Compile Include="ParameterDescriptor.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-    <Compile Include="ReflectedActionDescriptor.cs" />
-    <Compile Include="ReflectedActionDescriptorProvider.cs" />
-    <Compile Include="ReflectedActionExecutor.cs" />
-    <Compile Include="FilterActionInvoker.cs" />
-    <Compile Include="ReflectedActionInvokerProvider.cs" />
-    <Compile Include="ReflectedModelBuilder\IReflectedApplicationModelConvention.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedActionModel.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedApplicationModel.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedAttributeRouteModel.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedControllerModel.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedParameterModel.cs" />
-    <Compile Include="Rendering\CompositeViewEngine.cs" />
-    <Compile Include="Rendering\DynamicViewData.cs" />
-    <Compile Include="Rendering\Expressions\CachedExpressionCompiler.cs" />
-    <Compile Include="Rendering\Expressions\ExpressionHelper.cs" />
-    <Compile Include="Rendering\Expressions\ExpressionMetadataProvider.cs" />
-    <Compile Include="Rendering\Expressions\TryGetValueDelegate.cs" />
-    <Compile Include="Rendering\Expressions\TryGetValueProvider.cs" />
-    <Compile Include="Rendering\Expressions\ViewDataEvaluator.cs" />
-    <Compile Include="Rendering\Expressions\ViewDataInfo.cs" />
-    <Compile Include="Rendering\FormMethod.cs" />
-    <Compile Include="Rendering\Html5DateRenderingMode.cs" />
-    <Compile Include="Rendering\HtmlAttributePropertyHelper.cs" />
-    <Compile Include="Rendering\HtmlHelperDisplayExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperEditorExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperFormExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperInputExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperLabelExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperLinkExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperDisplayNameExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperNameExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperPartialExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperSelectExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperValidationExtensions.cs" />
-    <Compile Include="Rendering\HtmlHelperValueExtensions.cs" />
-    <Compile Include="Rendering\HtmlString.cs" />
-    <Compile Include="Rendering\Html\DefaultDisplayTemplates.cs" />
-    <Compile Include="Rendering\Html\DefaultEditorTemplates.cs" />
-    <Compile Include="Rendering\Html\HtmlHelper.cs" />
-    <Compile Include="Rendering\Html\HtmlHelperOfT.cs" />
-    <Compile Include="Rendering\Html\InputType.cs" />
-    <Compile Include="Rendering\Html\TagBuilder.cs" />
-    <Compile Include="Rendering\Html\TagRenderMode.cs" />
-    <Compile Include="Rendering\Html\TemplateBuilder.cs" />
-    <Compile Include="Rendering\Html\TemplateRenderer.cs" />
-    <Compile Include="Rendering\Html\ValidationHelpers.cs" />
-    <Compile Include="Rendering\ICanHasViewContext.cs" />
-    <Compile Include="Rendering\ICompositeViewEngine.cs" />
-    <Compile Include="Rendering\IHtmlHelper.cs" />
-    <Compile Include="Rendering\IHtmlHelperOfT.cs" />
-    <Compile Include="Rendering\IView.cs" />
-    <Compile Include="Rendering\IViewEngine.cs" />
-    <Compile Include="Rendering\IViewEngineProvider.cs" />
-    <Compile Include="Rendering\MultiSelectList.cs" />
-    <Compile Include="Rendering\MvcForm.cs" />
-    <Compile Include="Rendering\RazorViewEngineOptions.cs" />
-    <Compile Include="Rendering\SelectList.cs" />
-    <Compile Include="Rendering\SelectListGroup.cs" />
-    <Compile Include="Rendering\SelectListItem.cs" />
-    <Compile Include="Rendering\UnobtrusiveValidationAttributesGenerator.cs" />
-    <Compile Include="Rendering\ViewEngineResult.cs" />
-    <Compile Include="RouteAttribute.cs" />
-    <Compile Include="RouteConstraintAttribute.cs" />
-    <Compile Include="RouteDataActionConstraint.cs" />
-    <Compile Include="RouteKeyHandling.cs" />
-    <Compile Include="Routing\ActionSelectorDecisionTree.cs" />
-    <Compile Include="Routing\IActionSelectorDecisionTreeProvider.cs" />
-    <Compile Include="Routing\ActionSelectorDecisionTreeProvider.cs" />
-    <Compile Include="Routing\AttributeRoute.cs" />
-    <Compile Include="Routing\AttributeRouteInfo.cs" />
-    <Compile Include="Routing\AttributeRouteLinkGenerationEntry.cs" />
-    <Compile Include="Routing\AttributeRouteMatchingEntry.cs" />
-    <Compile Include="Routing\AttributeRoutePrecedence.cs" />
-    <Compile Include="Routing\AttributeRouting.cs" />
-    <Compile Include="Routing\IActionSelectionDecisionTree.cs" />
-    <Compile Include="Routing\IRouteTemplateProvider.cs" />
-    <Compile Include="Routing\RouteValueEqualityComparer.cs" />
-    <Compile Include="TemplateInfo.cs" />
-    <Compile Include="UrlHelper.cs" />
-    <Compile Include="UrlHelperExtensions.cs" />
-    <Compile Include="ViewComponents\ContentViewComponentResult.cs" />
-    <Compile Include="ViewComponents\DefaultViewComponentHelper.cs" />
-    <Compile Include="ViewComponents\DefaultViewComponentInvoker.cs" />
-    <Compile Include="ViewComponents\DefaultViewComponentInvokerFactory.cs" />
-    <Compile Include="ViewComponents\DefaultViewComponentInvokerProvider.cs" />
-    <Compile Include="ViewComponents\DefaultViewComponentActivator.cs" />
-    <Compile Include="ViewComponents\DefaultViewComponentSelector.cs" />
-    <Compile Include="ViewComponents\IViewComponentHelper.cs" />
-    <Compile Include="ViewComponents\IViewComponentInvoker.cs" />
-    <Compile Include="ViewComponents\IViewComponentInvokerFactory.cs" />
-    <Compile Include="ViewComponents\IViewComponentInvokerProvider.cs" />
-    <Compile Include="ViewComponents\IViewComponentResult.cs" />
-    <Compile Include="ViewComponents\IViewComponentActivator.cs" />
-    <Compile Include="ViewComponents\IViewComponentSelector.cs" />
-    <Compile Include="ViewComponents\JsonViewComponentResult.cs" />
-    <Compile Include="ViewComponents\ViewComponent.cs" />
-    <Compile Include="ViewComponents\ViewComponentAttribute.cs" />
-    <Compile Include="ViewComponents\ViewComponentContext.cs" />
-    <Compile Include="ViewComponents\ViewComponentConventions.cs" />
-    <Compile Include="ViewComponents\ViewComponentHelperExtensions.cs" />
-    <Compile Include="ViewComponents\ViewComponentInvokerProviderContext.cs" />
-    <Compile Include="ViewComponents\ViewComponentMethodSelector.cs" />
-    <Compile Include="ViewComponents\ViewViewComponentResult.cs" />
-    <Compile Include="ViewContext.cs" />
-    <Compile Include="ViewDataDictionary.cs" />
-    <Compile Include="ViewDataDictionaryOfT.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/Microsoft.AspNet.Mvc.HeaderValueAbstractions.kproj b/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/Microsoft.AspNet.Mvc.HeaderValueAbstractions.kproj
index 6fc2ae284f..7c7f516cc3 100644
--- a/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/Microsoft.AspNet.Mvc.HeaderValueAbstractions.kproj
+++ b/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/Microsoft.AspNet.Mvc.HeaderValueAbstractions.kproj
@@ -16,17 +16,6 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="FormattingUtilities.cs" />
-    <Compile Include="MediaTypeHeaderValue.cs" />
-    <Compile Include="MediaTypeHeaderValueRange.cs" />
-    <Compile Include="MediaTypeWithQualityHeaderValue.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-    <Compile Include="StringWithQualityHeaderValue.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Microsoft.AspNet.Mvc.ModelBinding.kproj b/src/Microsoft.AspNet.Mvc.ModelBinding/Microsoft.AspNet.Mvc.ModelBinding.kproj
index 629617a20c..cca53761de 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Microsoft.AspNet.Mvc.ModelBinding.kproj
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Microsoft.AspNet.Mvc.ModelBinding.kproj
@@ -16,116 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Resources.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Binders\ArrayModelBinder.cs" />
-    <Compile Include="Binders\BindingBehavior.cs" />
-    <Compile Include="Binders\BindingBehaviorAttribute.cs" />
-    <Compile Include="Binders\BindNeverAttribute.cs" />
-    <Compile Include="Binders\BindRequiredAttribute.cs" />
-    <Compile Include="Binders\ByteArrayModelBinder.cs" />
-    <Compile Include="Binders\CollectionModelBinder.cs" />
-    <Compile Include="Binders\ComplexModelDto.cs" />
-    <Compile Include="Binders\ComplexModelDtoModelBinder.cs" />
-    <Compile Include="Binders\ComplexModelDtoResult.cs" />
-    <Compile Include="Binders\CompositeModelBinder.cs" />
-    <Compile Include="Binders\DictionaryModelBinder.cs" />
-    <Compile Include="Binders\GenericModelBinder.cs" />
-    <Compile Include="Binders\ICompositeModelBinder.cs" />
-    <Compile Include="Binders\IModelBinder.cs" />
-    <Compile Include="Binders\IModelBinderProvider.cs" />
-    <Compile Include="Binders\KeyValuePairModelBinder.cs" />
-    <Compile Include="Binders\MutableObjectModelBinder.cs" />
-    <Compile Include="Binders\TypeConverterModelBinder.cs" />
-    <Compile Include="Binders\TypeMatchModelBinder.cs" />
-    <Compile Include="Formatters\XmlDataContractSerializerInputFormatter.cs" />
-    <Compile Include="Formatters\DelegatingStream.cs" />
-    <Compile Include="Formatters\FormattingUtilities.cs" />
-    <Compile Include="Formatters\IInputFormatter.cs" />
-    <Compile Include="Formatters\IInputFormatterProvider.cs" />
-    <Compile Include="Formatters\InputFormatterContext.cs" />
-    <Compile Include="Formatters\InputFormatterProviderContext.cs" />
-    <Compile Include="Formatters\JsonInputFormatter.cs" />
-    <Compile Include="Formatters\TempInputFormatterProvider.cs" />
-    <Compile Include="Formatters\XmlSerializerInputFormatter.cs" />
-    <Compile Include="Internal\CollectionExtensions.cs" />
-    <Compile Include="Internal\CollectionModelBinderUtil.cs" />
-    <Compile Include="Internal\ContentTypeHeaderValue.cs" />
-    <Compile Include="Internal\DictionaryHelper.cs" />
-    <Compile Include="Internal\EfficientTypePropertyKey.cs" />
-    <Compile Include="Internal\HttpRequestExtensions.cs" />
-    <Compile Include="Internal\ModelBindingContextExtensions.cs" />
-    <Compile Include="Internal\ModelBindingHelper.cs" />
-    <Compile Include="Internal\PrefixContainer.cs" />
-    <Compile Include="Metadata\AssociatedMetadataProvider.cs" />
-    <Compile Include="Metadata\CachedDataAnnotationsMetadataAttributes.cs" />
-    <Compile Include="Metadata\CachedDataAnnotationsModelMetadata.cs" />
-    <Compile Include="Metadata\CachedModelMetadata.cs" />
-    <Compile Include="Metadata\DataAnnotationsModelMetadataProvider.cs" />
-    <Compile Include="Metadata\EmptyModelMetadataProvider.cs" />
-    <Compile Include="Metadata\IModelMetadataProvider.cs" />
-    <Compile Include="Metadata\ModelMetadata.cs" />
-    <Compile Include="ModelBindingContext.cs" />
-    <Compile Include="ModelError.cs" />
-    <Compile Include="ModelErrorCollection.cs" />
-    <Compile Include="ModelState.cs" />
-    <Compile Include="ModelStateDictionary.cs" />
-    <Compile Include="ModelValidationState.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-    <Compile Include="Validation\AssociatedValidatorProvider.cs" />
-    <Compile Include="Validation\ClientModelValidationContext.cs" />
-    <Compile Include="Validation\RequiredAttributeAdapter.cs" />
-    <Compile Include="Validation\StringLengthAttributeAdapter.cs" />
-    <Compile Include="Validation\RangeAttributeAdapter.cs" />
-    <Compile Include="Validation\CompareAttributeAdapter.cs" />
-    <Compile Include="Validation\CompositeModelValidator.cs" />
-    <Compile Include="Validation\DataAnnotationsModelValidator.cs" />
-    <Compile Include="Validation\DataAnnotationsModelValidatorOfTAttribute.cs" />
-    <Compile Include="Validation\DataAnnotationsModelValidatorProvider.cs" />
-    <Compile Include="Validation\DataMemberModelValidatorProvider.cs" />
-    <Compile Include="Validation\DataTypeAttributeAdapter.cs" />
-    <Compile Include="Validation\ErrorModelValidator.cs" />
-    <Compile Include="Validation\IClientModelValidator.cs" />
-    <Compile Include="Validation\IModelValidator.cs" />
-    <Compile Include="Validation\IModelValidatorProvider.cs" />
-    <Compile Include="Validation\InvalidModelValidatorProvider.cs" />
-    <Compile Include="Validation\MaxLengthAttributeAdapter.cs" />
-    <Compile Include="Validation\MinLengthAttributeAdapter.cs" />
-    <Compile Include="Validation\ModelClientValidationEqualToRule.cs" />
-    <Compile Include="Validation\ModelClientValidationMaxLengthRule.cs" />
-    <Compile Include="Validation\ModelClientValidationMinLengthRule.cs" />
-    <Compile Include="Validation\ModelClientValidationRangeRule.cs" />
-    <Compile Include="Validation\ModelClientValidationRegexRule.cs" />
-    <Compile Include="Validation\ModelClientValidationRequiredRule.cs" />
-    <Compile Include="Validation\ModelClientValidationRule.cs" />
-    <Compile Include="Validation\ModelClientValidationStringLengthRule.cs" />
-    <Compile Include="Validation\ModelValidatedEventArgs.cs" />
-    <Compile Include="Validation\ModelValidatingEventArgs.cs" />
-    <Compile Include="Validation\ModelValidationContext.cs" />
-    <Compile Include="Validation\ModelValidationNode.cs" />
-    <Compile Include="Validation\ModelValidationResult.cs" />
-    <Compile Include="Validation\RegularExpressionAttributeAdapter.cs" />
-    <Compile Include="Validation\RequiredMemberModelValidator.cs" />
-    <Compile Include="Validation\ValidatableObjectAdapter.cs" />
-    <Compile Include="ValueProviders\CompositeValueProvider.cs" />
-    <Compile Include="ValueProviders\CompositeValueProviderFactory.cs" />
-    <Compile Include="ValueProviders\DictionaryBasedValueProvider.cs" />
-    <Compile Include="ValueProviders\ElementalValueProvider.cs" />
-    <Compile Include="ValueProviders\FormValueProviderFactory.cs" />
-    <Compile Include="ValueProviders\ICompositeValueProviderFactory.cs" />
-    <Compile Include="ValueProviders\IEnumerableValueProvider.cs" />
-    <Compile Include="ValueProviders\IValueProviderFactory.cs" />
-    <Compile Include="ValueProviders\IValueProviderFactoryProvider.cs" />
-    <Compile Include="ValueProviders\IValueProviders.cs" />
-    <Compile Include="ValueProviders\QueryStringValueProviderFactory.cs" />
-    <Compile Include="ValueProviders\ReadableStringCollectionValueProvider.cs" />
-    <Compile Include="ValueProviders\RouteValueValueProviderFactory.cs" />
-    <Compile Include="ValueProviders\ValueProviderFactoryContext.cs" />
-    <Compile Include="ValueProviders\ValueProviderResult.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/Microsoft.AspNet.Mvc.Razor.Host.kproj b/src/Microsoft.AspNet.Mvc.Razor.Host/Microsoft.AspNet.Mvc.Razor.Host.kproj
index 3029d6ab23..af2e37075a 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/Microsoft.AspNet.Mvc.Razor.Host.kproj
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/Microsoft.AspNet.Mvc.Razor.Host.kproj
@@ -16,26 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Resources.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IMvcRazorHost.cs" />
-    <Compile Include="InjectChunk.cs" />
-    <Compile Include="InjectChunkVisitor.cs" />
-    <Compile Include="InjectDescriptor.cs" />
-    <Compile Include="InjectParameterGenerator.cs" />
-    <Compile Include="ModelChunk.cs" />
-    <Compile Include="ModelChunkVisitor.cs" />
-    <Compile Include="ModelCodeGenerator.cs" />
-    <Compile Include="MvcCSharpChunkVisitor.cs" />
-    <Compile Include="MvcCSharpCodeBuilder.cs" />
-    <Compile Include="MvcCSharpCodeVistor.cs" />
-    <Compile Include="MvcRazorCodeParser.cs" />
-    <Compile Include="MvcRazorHost.cs" />
-    <Compile Include="MvcRazorHostOptions.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj
index 68240d76e0..2296699140 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj
+++ b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj
@@ -16,40 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Resources.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AttributeValue.cs" />
-    <Compile Include="BufferEntryCollection.cs" />
-    <Compile Include="Compilation\CompilationFailedException.cs" />
-    <Compile Include="Compilation\CompilationMessage.cs" />
-    <Compile Include="Compilation\CompilationResult.cs" />
-    <Compile Include="Compilation\CompilerCache.cs" />
-    <Compile Include="Compilation\ICompilationService.cs" />
-    <Compile Include="Compilation\RoslynCompilationService.cs" />
-    <Compile Include="Extensions\DictionaryExtensions.cs" />
-    <Compile Include="IRazorPage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RazorTextWriter.cs" />
-    <Compile Include="IViewStartProvider.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ViewStartProvider.cs" />
-    <Compile Include="VirtualPathRazorPageFactory.cs" />
-    <Compile Include="HelperResult.cs" />
-    <Compile Include="IRazorPageActivator.cs" />
-    <Compile Include="IRazorPageFactory.cs" />
-    <Compile Include="PositionTagged.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-    <Compile Include="RazorPage.cs" />
-    <Compile Include="RazorPageOfT.cs" />
-    <Compile Include="RazorView.cs" />
-    <Compile Include="RazorPageActivator.cs" />
-    <Compile Include="RazorViewEngine.cs" />
-    <Compile Include="Razor\IRazorCompilationService.cs" />
-    <Compile Include="Razor\RazorCompilationService.cs" />
-    <Compile Include="Services\IRoslynMetadataReference.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj
index 4ca3981866..5997d91907 100644
--- a/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj
+++ b/src/Microsoft.AspNet.Mvc/Microsoft.AspNet.Mvc.kproj
@@ -16,14 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BuilderExtensions.cs" />
-    <Compile Include="MvcOptionsSetup.cs" />
-    <Compile Include="MvcServiceCollectionExtensions.cs" />
-    <Compile Include="MvcServices.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj
index 9dc3aa1386..1afb3fc53e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj
@@ -17,111 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ActionAttributeTests.cs" />
-    <Compile Include="ActionExecutorTests.cs" />
-    <Compile Include="ActionResults\HttpNotFoundResultTests.cs" />
-    <Compile Include="ActionResults\HttpStatusCodeResultTests.cs" />
-    <Compile Include="ActionResults\ChallengeResultTest.cs" />
-    <Compile Include="ActionResults\ObjectContentResultTests.cs" />
-    <Compile Include="ActionResults\RedirectResultTest.cs" />
-    <Compile Include="ActionResults\RedirectToActionResultTest.cs" />
-    <Compile Include="ActionResults\RedirectToRouteResultTest.cs" />
-    <Compile Include="ActionResults\RedirectResultTest.cs" />
-    <Compile Include="DefaultActionDiscoveryConventionsActionSelectionTests.cs" />
-    <Compile Include="AntiXsrf\AntiForgeryOptionsTests.cs" />
-    <Compile Include="Filters\ProducesAttributeTests.cs" />
-    <Compile Include="Formatters\NoContentFormatterTests.cs" />
-    <Compile Include="Formatters\OutputFormatterTests.cs" />
-    <Compile Include="Formatters\TextPlainFormatterTests.cs" />
-    <Compile Include="DefaultViewComponentActivatorTests.cs" />
-    <Compile Include="HttpMethodProviderAttributesTests.cs" />
-    <Compile Include="Internal\DecisionTree\DecisionTreeBuilderTest.cs" />
-    <Compile Include="Logging\BeginScopeContext.cs" />
-    <Compile Include="Logging\TestLoggerFactory.cs" />
-    <Compile Include="Logging\WriteCoreContext.cs" />
-    <Compile Include="Logging\NullDisposable.cs" />
-    <Compile Include="Logging\NullLogger.cs" />
-    <Compile Include="Logging\NullLoggerFactory.cs" />
-    <Compile Include="Logging\TestSink.cs" />
-    <Compile Include="Logging\TestLogger.cs" />
-    <Compile Include="MediaTypeWithQualityHeaderValueTests.cs" />
-    <Compile Include="MvcRouteHandlerTests.cs" />
-    <Compile Include="OptionDescriptors\DefaultModelBindersProviderTest.cs" />
-    <Compile Include="OptionDescriptors\DefaultValueProviderFactoryProviderTest.cs" />
-    <Compile Include="OptionDescriptors\DefaultViewEngineProviderTest.cs" />
-    <Compile Include="OptionDescriptors\ModelBinderDescriptorExtensionsTest.cs" />
-    <Compile Include="OptionDescriptors\ModelBinderDescriptorTest.cs" />
-    <Compile Include="OptionDescriptors\OutputFormatterDescriptorExtensionTest.cs" />
-    <Compile Include="OptionDescriptors\OutputFormatterDescriptorTest.cs" />
-    <Compile Include="OptionDescriptors\ValueProviderFactoryDescriptorExtensionsTest.cs" />
-    <Compile Include="OptionDescriptors\ValueProviderFactoryDescriptorTest.cs" />
-    <Compile Include="OptionDescriptors\ViewEngineDescriptorTest.cs" />
-    <Compile Include="OptionDescriptors\ViewEngineDscriptorExtensionsTest.cs" />
-    <Compile Include="MediaTypeWithQualityHeaderValueTests.cs" />
-    <Compile Include="ParameterBinding\ModelBindingHelperTest.cs" />
-    <Compile Include="AntiXsrf\AntiForgeryTokenSerializerTest.cs" />
-    <Compile Include="AntiXsrf\ITokenProvider.cs" />
-    <Compile Include="AntiXsrf\ValidateAntiForgeryTokenAttributeTest.cs" />
-    <Compile Include="DefaultActionDiscoveryConventionsActionSelectionTests.cs" />
-    <Compile Include="DefaultActionDiscoveryConventionsTests.cs" />
-    <Compile Include="DefaultControllerActivatorTest.cs" />
-    <Compile Include="ExpiringFileInfoCacheTest.cs" />
-    <Compile Include="Filters\ActionFilterAttributeTests.cs" />
-    <Compile Include="Filters\AuthorizeAttributeTests.cs" />
-    <Compile Include="Filters\AuthorizeAttributeTestsBase.cs" />
-    <Compile Include="AntiXsrf\AntiForgeryTokenStoreTest.cs" />
-    <Compile Include="AntiXsrf\AntiForgeryTokenTest.cs" />
-    <Compile Include="AntiXsrf\AntiForgeryWorkerTests.cs" />
-    <Compile Include="AntiXsrf\BinaryBlobTest.cs" />
-    <Compile Include="AntiXsrf\ClaimUidExtractorTest.cs" />
-    <Compile Include="AntiXsrf\MockClaimsIdentity.cs" />
-    <Compile Include="AntiXsrf\TokenProviderTests.cs" />
-    <Compile Include="ControllerTests.cs" />
-    <Compile Include="DefaultActionSelectorTests.cs" />
-    <Compile Include="DefaultControllerAssemblyProviderTests.cs" />
-    <Compile Include="DefaultControllerFactoryTest.cs" />
-    <Compile Include="Filters\ResultFilterAttributeTest.cs" />
-    <Compile Include="JsonResultTest.cs" />
-    <Compile Include="KnownRouteValueConstraintTests.cs" />
-    <Compile Include="MockMvcOptionsAccessor.cs" />
-    <Compile Include="MvcOptionsTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyHelperTest.cs" />
-    <Compile Include="ReflectedActionDescriptorProviderTests.cs" />
-    <Compile Include="ReflectedActionInvokerTest.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedActionModelTests.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedAttributeRouteModelTests.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedControllerModelTests.cs" />
-    <Compile Include="ReflectedModelBuilder\ReflectedParameterModelTests.cs" />
-    <Compile Include="Rendering\CompositeViewEngineTest.cs" />
-    <Compile Include="Rendering\DefaultDisplayTemplatesTests.cs" />
-    <Compile Include="Rendering\DefaultEditorTemplatesTests.cs" />
-    <Compile Include="Rendering\DefaultTemplatesUtilities.cs" />
-    <Compile Include="Rendering\HtmlAttributePropertyHelperTest.cs" />
-    <Compile Include="Rendering\HtmlHelperDisplayNameExtensionsTest.cs" />
-    <Compile Include="Rendering\HtmlHelperDisplayTextTest.cs" />
-    <Compile Include="Rendering\HtmlHelperLabelExtensionsTest.cs" />
-    <Compile Include="Rendering\HtmlHelperNameExtensionsTest.cs" />
-    <Compile Include="Rendering\HtmlHelperValueExtensionsTest.cs" />
-    <Compile Include="Rendering\ViewContextTests.cs" />
-    <Compile Include="Rendering\ViewDataOfTTest.cs" />
-    <Compile Include="KnownRouteValueConstraintTests.cs" />
-    <Compile Include="RouteTemplateProviderAttributesTests.cs" />
-    <Compile Include="Routing\AttributeRoutePrecedenceTests.cs" />
-    <Compile Include="Routing\AttributeRouteTests.cs" />
-    <Compile Include="Routing\AttributeRoutingTest.cs" />
-    <Compile Include="StaticActionDiscoveryConventions.cs" />
-    <Compile Include="StaticControllerAssemblyProvider.cs" />
-    <Compile Include="TestController.cs" />
-    <Compile Include="TypeHelperTest.cs" />
-    <Compile Include="UrlHelperTest.cs" />
-    <Compile Include="ViewComponents\ViewViewComponentResultTest.cs" />
-    <Compile Include="ViewComponentTests.cs" />
-    <Compile Include="ViewResultTest.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj b/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj
index ebcd3020a1..4ca7feab6b 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj
@@ -24,32 +24,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="compiler\resources\BasicWebSite.Home.Index.html" />
-    <Content Include="compiler\resources\BasicWebSite.Home.PlainView.html" />
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BasicTests.cs" />
-    <Compile Include="OutputFormattterTests.cs" />
-    <Compile Include="ConnegTests.cs" />
-    <Compile Include="AntiForgeryTests.cs" />
-    <Compile Include="ModelBindingTests.cs" />
-    <Compile Include="ViewEngineTests.cs" />
-    <Compile Include="ActivatorTests.cs" />
-    <Compile Include="ValueProviderTests.cs" />
-    <Compile Include="CompositeViewEngineTests.cs" />
-    <Compile Include="DependencyResolverTests.cs" />
-    <Compile Include="HttpResponseHelpers.cs" />
-    <Compile Include="InlineConstraintTests.cs" />
-    <Compile Include="InputFormatterTests.cs" />
-    <Compile Include="NullLoggerFactory.cs" />
-    <Compile Include="ResourceHelpers.cs" />
-    <Compile Include="RoutingTests.cs" />
-    <Compile Include="TestApplicationEnvironment.cs" />
-    <Compile Include="TestAssemblyProvider.cs" />
-    <Compile Include="TestConfigurationProvider.cs" />
-    <Compile Include="TestHelper.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Tests.kproj b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Tests.kproj
index 16c5a045af..77ff9a85cf 100644
--- a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Tests.kproj
+++ b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Tests.kproj
@@ -17,12 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="StringWithQualityHeaderValueParsingTests.cs" />
-    <Compile Include="MediaTypeHeaderValueParsingTests.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj
index 5caee71a58..5f42449f44 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj
@@ -17,54 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Resources.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Binders\ArrayModelBinderTest.cs" />
-    <Compile Include="Binders\ByteArrayModelBinderTests.cs" />
-    <Compile Include="Binders\CollectionModelBinderTest.cs" />
-    <Compile Include="Binders\ComplexModelDtoResultTest.cs" />
-    <Compile Include="Binders\ComplexModelDtoTest.cs" />
-    <Compile Include="Binders\CompositeModelBinderTest.cs" />
-    <Compile Include="Binders\DictionaryModelBinderTest.cs" />
-    <Compile Include="Binders\KeyValuePairModelBinderTest.cs" />
-    <Compile Include="Binders\ModelBindingContextTest.cs" />
-    <Compile Include="Binders\MutableObjectModelBinderTest.cs" />
-    <Compile Include="Binders\TypeConverterModelBinderTest.cs" />
-    <Compile Include="Formatters\XmlDataContractSerializerInputFormatterTests.cs" />
-    <Compile Include="Formatters\DelegatingStreamTests.cs" />
-    <Compile Include="Formatters\JsonInputFormatterTest.cs" />
-    <Compile Include="Formatters\XmlSerializerInputFormatterTests.cs" />
-    <Compile Include="Internal\TypeExtensionTests.cs" />
-    <Compile Include="Metadata\AssociatedMetadataProviderTest.cs" />
-    <Compile Include="Metadata\CachedDataAnnotationsMetadataAttributesTest.cs" />
-    <Compile Include="Metadata\CachedDataAnnotationsModelMetadataProviderTest.cs" />
-    <Compile Include="Metadata\CachedDataAnnotationsModelMetadataTest.cs" />
-    <Compile Include="Metadata\ModelMetadataTest.cs" />
-    <Compile Include="ModelBindingContextTest.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-    <Compile Include="Utils\SimpleHttpValueProvider.cs" />
-    <Compile Include="Validation\RequiredAttributeAdapterTest.cs" />
-    <Compile Include="Validation\StringLengthAttributeAdapterTest.cs" />
-    <Compile Include="Validation\RangeAttributeAdapterTest.cs" />
-    <Compile Include="Validation\AssociatedValidatorProviderTest.cs" />
-    <Compile Include="Validation\CompareAttributeTest.cs" />
-    <Compile Include="Validation\DataAnnotationsModelValidatorProviderTest.cs" />
-    <Compile Include="Validation\DataAnnotationsModelValidatorTest.cs" />
-    <Compile Include="Validation\DataMemberModelValidatorProviderTest.cs" />
-    <Compile Include="Validation\ErrorModelValidatorTest.cs" />
-    <Compile Include="Validation\InvalidModelValidatorProviderTest.cs" />
-    <Compile Include="Validation\MaxLengthAttributeAdapterTest.cs" />
-    <Compile Include="Validation\MinLengthAttributeAdapterTest.cs" />
-    <Compile Include="Validation\ModelStateDictionaryTest.cs" />
-    <Compile Include="Validation\ModelValidationNodeTest.cs" />
-    <Compile Include="ValueProviders\DictionaryBasedValueProviderTests.cs" />
-    <Compile Include="ValueProviders\FormValueProviderFactoryTests.cs" />
-    <Compile Include="ValueProviders\QueryStringValueProviderFactoryTest.cs" />
-    <Compile Include="ValueProviders\ReadableStringCollectionValueProviderTests.cs" />
-    <Compile Include="ValueProviders\ValueProviderResultTest.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Microsoft.AspNet.Mvc.Razor.Host.Test.kproj b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Microsoft.AspNet.Mvc.Razor.Host.Test.kproj
index 2ddb6fbee8..37d1faa630 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Microsoft.AspNet.Mvc.Razor.Host.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/Microsoft.AspNet.Mvc.Razor.Host.Test.kproj
@@ -22,25 +22,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="Project.json" />
-    <Content Include="TestFiles\Input\InjectWithModel.cshtml" />
-    <Content Include="TestFiles\Input\Model.cshtml" />
-    <Content Include="TestFiles\Input\Inject.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ModelChunkVisitorTest.cs" />
-    <Compile Include="InjectChunkVisitorTest.cs" />
-    <Compile Include="MvcCSharpRazorCodeParserTest.cs" />
-    <Compile Include="SpanFactory\RawTextSymbol.cs" />
-    <Compile Include="SpanFactory\SpanConstructor.cs" />
-    <Compile Include="SpanFactory\SpanFactory.cs" />
-    <Compile Include="SpanFactory\SpanFactoryExtensions.cs" />
-    <Compile Include="SpanFactory\UnclassifiedSpanConstructor.cs" />
-    <Compile Include="StringTextBuffer.cs" />
-    <Compile Include="TestFiles\Output\InjectWithModel.cs" />
-    <Compile Include="TestFiles\Output\Model.cs" />
-    <Compile Include="TestFiles\Output\Inject.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj b/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj
index 9d7e6cc0c2..5e60e5bf4b 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj
@@ -17,21 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Compilation\CompilationResultTest.cs" />
-    <Compile Include="BufferEntryCollectionTest.cs" />
-    <Compile Include="MvcRazorCodeParserTest.cs" />
-    <Compile Include="RazorCompilationServiceTest.cs" />
-    <Compile Include="RazorPageActivatorTest.cs" />
-    <Compile Include="RazorTextWriterTest.cs" />
-    <Compile Include="RazorViewEngineTest.cs" />
-    <Compile Include="RazorPageTest.cs" />
-    <Compile Include="RazorViewTest.cs" />
-    <Compile Include="SpanFactory.cs" />
-    <Compile Include="ViewStartProviderTest.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Test/Microsoft.AspNet.Mvc.Test.kproj b/test/Microsoft.AspNet.Mvc.Test/Microsoft.AspNet.Mvc.Test.kproj
index 8ea3d6d5b9..b609daa216 100644
--- a/test/Microsoft.AspNet.Mvc.Test/Microsoft.AspNet.Mvc.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.Test/Microsoft.AspNet.Mvc.Test.kproj
@@ -22,11 +22,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="Project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MvcOptionSetupTest.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/ActivatorWebSite/ActivatorWebSite.kproj b/test/WebSites/ActivatorWebSite/ActivatorWebSite.kproj
index 1c50011d2e..a5e7386a42 100644
--- a/test/WebSites/ActivatorWebSite/ActivatorWebSite.kproj
+++ b/test/WebSites/ActivatorWebSite/ActivatorWebSite.kproj
@@ -22,21 +22,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="Project.json" />
-    <Content Include="Views\View\ConsumeDefaultProperties.cshtml" />
-    <Content Include="Views\View\ConsumeInjectedService.cshtml" />
-    <Content Include="Views\View\ConsumeServicesFromBaseType.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Components\TestComponent.cs" />
-    <Compile Include="Controllers\CannotBeActivatedController.cs" />
-    <Compile Include="Controllers\PlainController.cs" />
-    <Compile Include="Controllers\RegularController.cs" />
-    <Compile Include="Controllers\ViewController.cs" />
-    <Compile Include="Services\MyService.cs" />
-    <Compile Include="Services\ViewService.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/AntiForgeryWebSite/AntiForgeryWebSite.kproj b/test/WebSites/AntiForgeryWebSite/AntiForgeryWebSite.kproj
index 2d61da8f44..7237c6b694 100644
--- a/test/WebSites/AntiForgeryWebSite/AntiForgeryWebSite.kproj
+++ b/test/WebSites/AntiForgeryWebSite/AntiForgeryWebSite.kproj
@@ -27,18 +27,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>11178</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Controllers\AccountController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Models\AccountViewModels.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Views\Account\Login.cshtml" />
-    <Content Include="Views\Home\MyView.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
-    <Content Include="Views\Shared\_LoginPartial.cshtml" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/AutofacWebSite/AutofacWebSite.kproj b/test/WebSites/AutofacWebSite/AutofacWebSite.kproj
index 95ea09b874..2a6774684d 100644
--- a/test/WebSites/AutofacWebSite/AutofacWebSite.kproj
+++ b/test/WebSites/AutofacWebSite/AutofacWebSite.kproj
@@ -25,16 +25,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>38823</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Views\Basic\Index.cshtml" />
-    <Content Include="Views\DI\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Controllers\BasicController.cs" />
-    <Compile Include="Controllers\DIController.cs" />
-    <Compile Include="HelloWorldBuilder.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/BasicWebSite/BasicWebSite.kproj b/test/WebSites/BasicWebSite/BasicWebSite.kproj
index c2039cb40b..487e2b8390 100644
--- a/test/WebSites/BasicWebSite/BasicWebSite.kproj
+++ b/test/WebSites/BasicWebSite/BasicWebSite.kproj
@@ -27,19 +27,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>38820</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="ActionDescriptorCreationCounter.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\MonitorController.cs" />
-    <Compile Include="Controllers\UsersController.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-    <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\Home\PlainView.cshtml" />
-    <Content Include="Views\Shared\Error.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/CompositeViewEngine/CompositeViewEngine.kproj b/test/WebSites/CompositeViewEngine/CompositeViewEngine.kproj
index e28ebebef3..1947b211ad 100644
--- a/test/WebSites/CompositeViewEngine/CompositeViewEngine.kproj
+++ b/test/WebSites/CompositeViewEngine/CompositeViewEngine.kproj
@@ -22,16 +22,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="Project.json" />
-    <Content Include="Views\Home\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="HomeController.cs" />
-    <Compile Include="Startup.cs" />
-    <Compile Include="TestPartialView.cs" />
-    <Compile Include="TestView.cs" />
-    <Compile Include="TestViewEngine.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/ConnegWebSite/ConnegWebsite.kproj b/test/WebSites/ConnegWebSite/ConnegWebsite.kproj
index 727e56bd55..f0d44a762b 100644
--- a/test/WebSites/ConnegWebSite/ConnegWebsite.kproj
+++ b/test/WebSites/ConnegWebSite/ConnegWebsite.kproj
@@ -22,21 +22,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="Project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Controllers\NormalController.cs" />
-    <Compile Include="Controllers\NoProducesContentOnClassController.cs" />
-    <Compile Include="Controllers\ProducesContentBaseController.cs" />
-    <Compile Include="Controllers\ProducesContentOnClassController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\NoContentController.cs" />
-    <Compile Include="Controllers\TextPlainController.cs" />
-    <Compile Include="Models\User.cs" />
-    <Compile Include="ContentType.cs" />
-    <Compile Include="PlainTextFormatter.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/FormatterWebSite/FormatterWebSite.kproj b/test/WebSites/FormatterWebSite/FormatterWebSite.kproj
index b5b34fbbd0..459470c199 100644
--- a/test/WebSites/FormatterWebSite/FormatterWebSite.kproj
+++ b/test/WebSites/FormatterWebSite/FormatterWebSite.kproj
@@ -27,13 +27,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>38820</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Models\DummyClass.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj b/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj
index 7e3c0b295a..c7fe54265d 100644
--- a/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj
+++ b/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj
@@ -30,19 +30,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DevelopmentServerPort>624661</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\UsersController.cs" />
-    <Compile Include="DefaultCommandLineArgumentBuilder.cs" />
-    <Compile Include="ICommandLineArgumentProvider.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Data\config.json" />
-    <Content Include="project.json" />
-    <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\Shared\Error.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/Microsoft.AspNet.Mvc.TestConfiguration.kproj b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/Microsoft.AspNet.Mvc.TestConfiguration.kproj
index 8c99cd5fe9..a64bd01dba 100644
--- a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/Microsoft.AspNet.Mvc.TestConfiguration.kproj
+++ b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/Microsoft.AspNet.Mvc.TestConfiguration.kproj
@@ -24,12 +24,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="BuilderExtensions.cs" />
-    <Compile Include="ITestConfigurationProvider.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/ModelBindingWebSite/ModelBindingWebSite.kproj b/test/WebSites/ModelBindingWebSite/ModelBindingWebSite.kproj
index f098cef95a..853f3bdca3 100644
--- a/test/WebSites/ModelBindingWebSite/ModelBindingWebSite.kproj
+++ b/test/WebSites/ModelBindingWebSite/ModelBindingWebSite.kproj
@@ -27,12 +27,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>38820</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/RazorWebSite/RazorWebSite.kproj b/test/WebSites/RazorWebSite/RazorWebSite.kproj
index 1bbeeed525..26e925c321 100644
--- a/test/WebSites/RazorWebSite/RazorWebSite.kproj
+++ b/test/WebSites/RazorWebSite/RazorWebSite.kproj
@@ -22,27 +22,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="Project.json" />
-    <Content Include="Views\Shared\Components\ComponentThatSetsTitle\Default.cshtml" />
-    <Content Include="Views\Shared\_LayoutWithTitle.cshtml" />
-    <Content Include="Views\Shared\_Partial.cshtml" />
-    <Content Include="Views\Shared\_PartialThatSetsTitle.cshtml" />
-    <Content Include="Views\ViewEngine\ViewWithTitle.cshtml" />
-    <Content Include="Views\ViewEngine\ViewWithNestedLayout.cshtml" />
-    <Content Include="Views\ViewEngine\ViewWithLayout.cshtml" />
-    <Content Include="Views\ViewEngine\ViewWithFullPath.cshtml" />
-    <Content Include="Views\ViewEngine\ViewWithPartial.cshtml" />
-    <Content Include="Views\ViewEngine\ViewWithoutLayout.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
-    <Content Include="Views\ViewEngine\_NestedLayout.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Components\ComponentThatSetsTitle.cs" />
-    <Compile Include="Controllers\ViewEngineController.cs" />
-    <Compile Include="Models\Person.cs" />
-    <Compile Include="Models\Address.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/RoutingWebSite/RoutingWebSite.kproj b/test/WebSites/RoutingWebSite/RoutingWebSite.kproj
index d527b3506d..9adb962db3 100644
--- a/test/WebSites/RoutingWebSite/RoutingWebSite.kproj
+++ b/test/WebSites/RoutingWebSite/RoutingWebSite.kproj
@@ -27,26 +27,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>11178</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Areas\Admin\UserManagementController.cs" />
-    <Compile Include="Areas\Travel\FlightController.cs" />
-    <Compile Include="Areas\Travel\HomeController.cs" />
-    <Compile Include="Areas\Travel\RailController.cs" />
-    <Compile Include="Controllers\BlogController.cs" />
-    <Compile Include="Controllers\EmployeeController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\Products\ProductsController.cs" />
-    <Compile Include="Controllers\Products\US\ProductsController.cs" />
-    <Compile Include="Controllers\StoreController.cs" />
-    <Compile Include="Controllers\TeamController.cs" />
-    <Compile Include="HttpMergeAttribute.cs" />
-    <Compile Include="CountryNeutralAttribute.cs" />
-    <Compile Include="CountrySpecificAttribute.cs" />
-    <Compile Include="Startup.cs" />
-    <Compile Include="TestResponseGenerator.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/WebSites/ValueProvidersSite/ValueProvidersSite.kproj b/test/WebSites/ValueProvidersSite/ValueProvidersSite.kproj
index f652f49abf..843add23d7 100644
--- a/test/WebSites/ValueProvidersSite/ValueProvidersSite.kproj
+++ b/test/WebSites/ValueProvidersSite/ValueProvidersSite.kproj
@@ -22,13 +22,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="Project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomValueProviderFactory.cs" />
-    <Compile Include="HomeController.cs" />
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file