diff --git a/samples/HelloWorld/HelloWorld.kproj b/samples/HelloWorld/HelloWorld.kproj
index d0e521b2a1..cad0b80483 100644
--- a/samples/HelloWorld/HelloWorld.kproj
+++ b/samples/HelloWorld/HelloWorld.kproj
@@ -16,12 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/samples/SelfHostServer/SelfHostServer.kproj b/samples/SelfHostServer/SelfHostServer.kproj
index 27e7adbaef..efbadb0189 100644
--- a/samples/SelfHostServer/SelfHostServer.kproj
+++ b/samples/SelfHostServer/SelfHostServer.kproj
@@ -19,14 +19,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DevelopmentServerPort>57504</DevelopmentServerPort>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="App.config" />
-    <Content Include="project.json" />
-    <Content Include="Public\1kb.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Startup.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj b/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj
index 3c5c6aba75..5e97f1a4bf 100644
--- a/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj
+++ b/src/Microsoft.AspNet.Security.Windows/Microsoft.AspNet.Security.Windows.kproj
@@ -17,58 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AuthTypes.cs" />
-    <Compile Include="ComNetOS.cs" />
-    <Compile Include="Constants.cs" />
-    <Compile Include="DictionaryExtensions.cs" />
-    <Compile Include="DigestCache.cs" />
-    <Compile Include="DisconnectAsyncResult.cs" />
-    <Compile Include="HeaderEncoding.cs" />
-    <Compile Include="HttpKnownHeaderNames.cs" />
-    <Compile Include="HttpStatusCode.cs" />
-    <Compile Include="Legacy\CaseInsinsitiveAscii.cs" />
-    <Compile Include="Legacy\GlobalLog.cs" />
-    <Compile Include="Legacy\HttpListenerContext.cs" />
-    <Compile Include="Legacy\Internal.cs" />
-    <Compile Include="Legacy\Logging.cs" />
-    <Compile Include="Legacy\LoggingObject.cs" />
-    <Compile Include="Legacy\SR.cs" />
-    <Compile Include="Legacy\ValidationHelper.cs" />
-    <Compile Include="NativeInterop\AuthIdentity.cs" />
-    <Compile Include="NativeInterop\ContextFlags.cs" />
-    <Compile Include="NativeInterop\NativeSSPI.cs" />
-    <Compile Include="NativeInterop\SafeCloseHandle.cs" />
-    <Compile Include="NativeInterop\SafeCredentialReference.cs" />
-    <Compile Include="NativeInterop\SafeDeleteContext.cs" />
-    <Compile Include="NativeInterop\SafeFreeCertContext.cs" />
-    <Compile Include="NativeInterop\SafeFreeContextBuffer.cs" />
-    <Compile Include="NativeInterop\SafeFreeContextBufferChannelBinding.cs" />
-    <Compile Include="NativeInterop\SafeFreeCredentials.cs" />
-    <Compile Include="NativeInterop\SafeLocalFree.cs" />
-    <Compile Include="NativeInterop\SafeSspiAuthDataHandle.cs" />
-    <Compile Include="NativeInterop\SchProtocols.cs" />
-    <Compile Include="NativeInterop\SecSizes.cs" />
-    <Compile Include="NativeInterop\SecurityBuffer.cs" />
-    <Compile Include="NativeInterop\SecurityBufferDescriptor.cs" />
-    <Compile Include="NativeInterop\SecurityPackageInfoClass.cs" />
-    <Compile Include="NativeInterop\SslConnectionInfo.cs" />
-    <Compile Include="NativeInterop\SSPIAuthType.cs" />
-    <Compile Include="NativeInterop\SSPIHandle.cs" />
-    <Compile Include="NativeInterop\SSPISessionCache.cs" />
-    <Compile Include="NativeInterop\SSPIWrapper.cs" />
-    <Compile Include="NativeInterop\StreamSizes.cs" />
-    <Compile Include="NativeInterop\UnsafeNativeMethods.cs" />
-    <Compile Include="NegotiationInfoClass.cs" />
-    <Compile Include="NTAuthentication.cs" />
-    <Compile Include="PrefixCollection.cs" />
-    <Compile Include="PrefixEnumerator.cs" />
-    <Compile Include="ServiceNameStore.cs" />
-    <Compile Include="WindowsAuthMiddleware.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj b/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj
index b3e1459db4..72e20d0eb5 100644
--- a/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj
+++ b/src/Microsoft.AspNet.Server.WebListener/Microsoft.AspNet.Server.WebListener.kproj
@@ -16,20 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyNeutralAttribute.cs" />
-    <Compile Include="AuthenticationHandler.cs" />
-    <Compile Include="FeatureContext.cs" />
-    <Compile Include="Helpers.cs" />
-    <Compile Include="IServerFactory.cs" />
-    <Compile Include="LogHelper.cs" />
-    <Compile Include="ServerFactory.cs" />
-    <Compile Include="ServerInformation.cs" />
-    <Compile Include="MessagePump.cs" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.Net.Http.Server/Microsoft.Net.Http.Server.kproj b/src/Microsoft.Net.Http.Server/Microsoft.Net.Http.Server.kproj
index 7ef3155968..57ece075d0 100644
--- a/src/Microsoft.Net.Http.Server/Microsoft.Net.Http.Server.kproj
+++ b/src/Microsoft.Net.Http.Server/Microsoft.Net.Http.Server.kproj
@@ -17,72 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AsyncAcceptContext.cs" />
-    <Compile Include="AuthenticationManager.cs" />
-    <Compile Include="AuthenticationTypes.cs" />
-    <Compile Include="Constants.cs" />
-    <Compile Include="fx\Microsoft\Win32\SafeHandles\CriticalHandleZeroOrMinusOneIsInvalid.cs" />
-    <Compile Include="fx\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" />
-    <Compile Include="fx\System\Diagnostics\TraceEventType.cs" />
-    <Compile Include="fx\System\ExternDll.cs" />
-    <Compile Include="fx\System\Runtime\InteropServices\ExternalException.cs" />
-    <Compile Include="fx\System\SafeNativeMethods.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="Helpers.cs" />
-    <Compile Include="LogHelper.cs" />
-    <Compile Include="NativeInterop\AddressFamily.cs" />
-    <Compile Include="NativeInterop\ComNetOS.cs" />
-    <Compile Include="NativeInterop\ContextAttribute.cs" />
-    <Compile Include="NativeInterop\HttpRequestQueueV2Handle.cs" />
-    <Compile Include="NativeInterop\HttpServerSessionHandle.cs" />
-    <Compile Include="NativeInterop\HttpSysRequestHeader.cs" />
-    <Compile Include="NativeInterop\HttpSysResponseHeader.cs" />
-    <Compile Include="NativeInterop\HttpSysSettings.cs" />
-    <Compile Include="NativeInterop\IntPtrHelper.cs" />
-    <Compile Include="NativeInterop\NclUtilities.cs" />
-    <Compile Include="NativeInterop\SafeLoadLibrary.cs" />
-    <Compile Include="NativeInterop\SafeLocalFree.cs" />
-    <Compile Include="NativeInterop\SafeLocalFreeChannelBinding.cs" />
-    <Compile Include="NativeInterop\SafeLocalMemHandle.cs" />
-    <Compile Include="NativeInterop\SafeNativeOverlapped.cs" />
-    <Compile Include="NativeInterop\SchProtocols.cs" />
-    <Compile Include="NativeInterop\SecurityStatus.cs" />
-    <Compile Include="NativeInterop\SocketAddress.cs" />
-    <Compile Include="NativeInterop\SSPIHandle.cs" />
-    <Compile Include="NativeInterop\UnsafeNativeMethods.cs" />
-    <Compile Include="RequestProcessing\HeaderCollection.cs" />
-    <Compile Include="RequestProcessing\HeaderParser.cs" />
-    <Compile Include="WebListener.cs" />
-    <Compile Include="RequestProcessing\BoundaryType.cs" />
-    <Compile Include="RequestProcessing\ClientCertLoader.cs" />
-    <Compile Include="RequestProcessing\HeaderEncoding.cs" />
-    <Compile Include="RequestProcessing\HttpKnownHeaderNames.cs" />
-    <Compile Include="RequestProcessing\HttpReasonPhrase.cs" />
-    <Compile Include="RequestProcessing\HttpStatusCode.cs" />
-    <Compile Include="RequestProcessing\NativeRequestContext.cs" />
-    <Compile Include="RequestProcessing\OpaqueStream.cs" />
-    <Compile Include="RequestProcessing\Request.cs" />
-    <Compile Include="RequestProcessing\RequestContext.cs" />
-    <Compile Include="RequestProcessing\RequestHeaders.cs" />
-    <Compile Include="RequestProcessing\RequestHeaders.Generated.cs" />
-    <Compile Include="RequestProcessing\RequestStream.cs" />
-    <Compile Include="RequestProcessing\RequestUriBuilder.cs" />
-    <Compile Include="RequestProcessing\Response.cs" />
-    <Compile Include="RequestProcessing\ResponseStream.cs" />
-    <Compile Include="RequestProcessing\ResponseStreamAsyncResult.cs" />
-    <Compile Include="RequestProcessing\SslStatus.cs" />
-    <Compile Include="Resources.Designer.cs" />
-    <Compile Include="TimeoutManager.cs" />
-    <Compile Include="UrlPrefix.cs" />
-    <Compile Include="ValidationHelper.cs" />
-    <Compile Include="WebListenerException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="CustomDictionary.xml" />
-    <Content Include="project.json" />
-    <Content Include="RequestProcessing\RequestHeaders.Generated.tt" />
-    <Content Include="Resources.resx" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.Net.WebSockets/Microsoft.Net.WebSockets.kproj b/src/Microsoft.Net.WebSockets/Microsoft.Net.WebSockets.kproj
index 0d270aef1d..e3d0679128 100644
--- a/src/Microsoft.Net.WebSockets/Microsoft.Net.WebSockets.kproj
+++ b/src/Microsoft.Net.WebSockets/Microsoft.Net.WebSockets.kproj
@@ -17,32 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="fx\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs" />
-    <Compile Include="fx\System\AccessViolationException.cs" />
-    <Compile Include="fx\System\ComponentModel\Win32Exception.cs" />
-    <Compile Include="fx\System\ExternDll.cs" />
-    <Compile Include="fx\System\Runtime\InteropServices\ExternalException.cs" />
-    <Compile Include="fx\System\SafeNativeMethods.cs" />
-    <Compile Include="fx\System\SystemException.cs" />
-    <Compile Include="HttpKnownHeaderNames.cs" />
-    <Compile Include="Legacy\SR.cs" />
-    <Compile Include="Legacy\WebSocketHttpListenerDuplexStream.cs" />
-    <Compile Include="NativeInterop\SafeLoadLibrary.cs" />
-    <Compile Include="NativeInterop\SafeNativeOverlapped.cs" />
-    <Compile Include="NativeInterop\SafeWebSocketHandle.cs" />
-    <Compile Include="NativeInterop\UnsafeNativeMethods.cs" />
-    <Compile Include="ServerWebSocket.cs" />
-    <Compile Include="WebSocketBase.cs" />
-    <Compile Include="WebSocketBuffer.cs" />
-    <Compile Include="WebSocketConstants.cs" />
-    <Compile Include="WebSocketError.cs" />
-    <Compile Include="WebSocketException.cs" />
-    <Compile Include="WebSocketHelpers.cs" />
-    <Compile Include="WebSocketReceiveResultExtensions.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.Server.WebListener.FunctionalTests/Microsoft.AspNet.Server.WebListener.FunctionalTests.kproj b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Microsoft.AspNet.Server.WebListener.FunctionalTests.kproj
index 93e75d54f4..4c049bd5dc 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Microsoft.AspNet.Server.WebListener.FunctionalTests.kproj
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/Microsoft.AspNet.Server.WebListener.FunctionalTests.kproj
@@ -17,23 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AuthenticationTests.cs" />
-    <Compile Include="HttpsTests.cs" />
-    <Compile Include="WebSocketTests.cs" />
-    <Compile Include="OpaqueUpgradeTests.cs" />
-    <Compile Include="RequestBodyTests.cs" />
-    <Compile Include="RequestHeaderTests.cs" />
-    <Compile Include="RequestTests.cs" />
-    <Compile Include="ResponseBodyTests.cs" />
-    <Compile Include="ResponseHeaderTests.cs" />
-    <Compile Include="ResponseSendFileTests.cs" />
-    <Compile Include="ResponseTests.cs" />
-    <Compile Include="ServerTests.cs" />
-    <Compile Include="Utilities.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/Microsoft.Net.Http.Server.FunctionalTests/Microsoft.Net.Http.Server.FunctionalTests.kproj b/test/Microsoft.Net.Http.Server.FunctionalTests/Microsoft.Net.Http.Server.FunctionalTests.kproj
index a579d02c1f..5f105dd1f6 100644
--- a/test/Microsoft.Net.Http.Server.FunctionalTests/Microsoft.Net.Http.Server.FunctionalTests.kproj
+++ b/test/Microsoft.Net.Http.Server.FunctionalTests/Microsoft.Net.Http.Server.FunctionalTests.kproj
@@ -17,23 +17,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AuthenticationTests.cs" />
-    <Compile Include="HttpsTests.cs" />
-    <Compile Include="WebSocketTests.cs" />
-    <Compile Include="OpaqueUpgradeTests.cs" />
-    <Compile Include="RequestBodyTests.cs" />
-    <Compile Include="RequestHeaderTests.cs" />
-    <Compile Include="RequestTests.cs" />
-    <Compile Include="ResponseBodyTests.cs" />
-    <Compile Include="ResponseHeaderTests.cs" />
-    <Compile Include="ResponseSendFileTests.cs" />
-    <Compile Include="ResponseTests.cs" />
-    <Compile Include="ServerTests.cs" />
-    <Compile Include="Utilities.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