diff --git a/eng/targets/GenerateServiceHubConfigurationFiles.targets b/eng/targets/GenerateServiceHubConfigurationFiles.targets
index 7d210b4f5f..2d812aa4b0 100644
--- a/eng/targets/GenerateServiceHubConfigurationFiles.targets
+++ b/eng/targets/GenerateServiceHubConfigurationFiles.targets
@@ -8,28 +8,9 @@
 
   <Target Name="CalculateServiceHubConfigurationFiles">
     <ItemGroup>
-      <_ServicesWithSuffix Include="@(ServiceHubService)" FileSuffix="64" HostIdSuffix="" />
-      <_ServicesWithSuffix Include="@(ServiceHubService)" FileSuffix="64S" HostIdSuffix="S" />
       <_CoreServicesWithSuffix Include="@(ServiceHubService)" FileSuffix="Core64" HostIdSuffix="" />
       <_CoreServicesWithSuffix Include="@(ServiceHubService)" FileSuffix="Core64S" HostIdSuffix="S" />
 
-      <ServiceHubServiceJsonFile Include="$(IntermediateOutputPath)%(_ServicesWithSuffix.Identity)%(_ServicesWithSuffix.FileSuffix).servicehub.service.json" >
-        <Content>
-          <![CDATA[{
-  "host": "netfx.anycpu",
-  "hostId": "RoslynCodeAnalysisService%(_ServicesWithSuffix.HostIdSuffix)",
-  "hostGroupAllowed": true,
-  "entryPoint": {
-    "assemblyPath": "Microsoft.CodeAnalysis.Remote.Razor.dll",
-    "fullClassName": "%(_ServicesWithSuffix.ClassName)",
-    "appBasePath": "%VSAPPIDDIR%",
-    "configPath": "%PkgDefApplicationConfigFile%"
-  }
-}
-]]>
-        </Content>
-      </ServiceHubServiceJsonFile>
-
       <ServiceHubServiceJsonFile Include="$(IntermediateOutputPath)$(ServiceHubCoreSubPath)\%(_CoreServicesWithSuffix.Identity)%(_CoreServicesWithSuffix.FileSuffix).servicehub.service.json" >
         <Content>
           <![CDATA[{
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Directory.Build.targets b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Directory.Build.targets
index 27b20e38fd..a2ba4165d4 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Directory.Build.targets
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Directory.Build.targets
@@ -3,9 +3,6 @@
 <Project>
   <Target Name="GeneratePkgDefServiceRegistrations" BeforeTargets="GenerateBrokeredServicesPkgDef">
     <ItemGroup>
-      <PkgDefBrokeredService Include="@(ServiceHubService->'%(Identity)')" />
-      <PkgDefBrokeredService Include="@(ServiceHubService->'%(Identity)64')" />
-      <PkgDefBrokeredService Include="@(ServiceHubService->'%(Identity)64S')" />
       <PkgDefBrokeredService Include="@(ServiceHubService->'%(Identity)Core64')" SubFolder="$(ServiceHubCoreSubPath)" />
       <PkgDefBrokeredService Include="@(ServiceHubService->'%(Identity)Core64S')" SubFolder="$(ServiceHubCoreSubPath)" />
     </ItemGroup>