diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
index 5ecbdb6c2..d22ad04eb 100644
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Microsoft.DotNet.Cli.Compile.targets
@@ -15,44 +15,16 @@
   </ItemGroup>
 
   <Target Name="Compile" DependsOnTargets="Prepare;
-                                           SetupStage;
-                                           CompileStage;
+                                           CompileCLI;
                                            PublishSdks;
                                            PublishTemplates;
                                            BuildProjectsForNuGetPackages;
                                            GetNuGetPackagesArchive;" />
 
-  <Target Name="SetupStage"
-          DependsOnTargets="Prepare">
-    <PropertyGroup>
-      <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <CompileStageInputs Include="$(SrcDirectory)/**/*.cs" Exclude="$(SrcDirectory)/**/obj/**/*.cs" />
-      <CompileStageInputs Include="$(SrcDirectory)/**/*.csproj;$(SrcDirectory)/**/project.assets.json" />
-
-      <Stage Include="Stage1">
-        <Inputs>@(CompileStageInputs)</Inputs>
-        <StageDirectory>$(Stage1Directory)</StageDirectory>
-        <StageSymbolsDirectory>$(Stage1SymbolsDirectory)</StageSymbolsDirectory>
-        <DotnetDir>$(Stage0Directory)</DotnetDir>
-      </Stage>
-      <Stage Include="Stage2">
-        <Inputs>@(CompileStageInputs)</Inputs>
-        <StageDirectory>$(Stage2Directory)</StageDirectory>
-        <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
-        <DotnetDir>$(Stage0Directory)</DotnetDir>
-      </Stage>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="CompileStage"
-          DependsOnTargets="SetupStage;
-                            InitCrossgenProps;"
-          Inputs="%(Stage.Inputs)"
-          Outputs="%(StageDirectory)/sdk/$(SdkVersion)/dotnet.dll">
+  <Target Name="CompileCLI"
+          DependsOnTargets="InitCrossgenProps;">
       <PropertyGroup>
+        <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
         <DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
         <DynamicLibPrefix Condition=" '$(OSName)' != 'win' ">lib</DynamicLibPrefix>
 
@@ -64,8 +36,8 @@
         <DotnetHostFxrBaseName>$(DynamicLibPrefix)hostfxr$(DynamicLibSuffix)</DotnetHostFxrBaseName>
         <HostPolicyBaseName>$(DynamicLibPrefix)hostpolicy$(DynamicLibSuffix)</HostPolicyBaseName>
 
-        <StageDirectory>%(Stage.StageDirectory)</StageDirectory>
-        <StageSymbolsDirectory>%(Stage.StageSymbolsDirectory)</StageSymbolsDirectory>
+        <StageDirectory>$(Stage2Directory)</StageDirectory>
+        <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
         <SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
         <BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
         <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
@@ -74,10 +46,6 @@
       </PropertyGroup>
 
       <ItemGroup>
-        <BinObj Remove="*" />
-        <BinObj Include="$(SrcDirectory)/**/bin/**/*" />
-        <BinObj Include="$(SrcDirectory)/**/obj/**/*" Exclude="$(SrcDirectory)/**/obj/project.assets.json;$(SrcDirectory)/**/obj/*.csproj.nuget.g.props;$(SrcDirectory)/**/obj/*.csproj.nuget.g.targets" />
-
         <SharedFramework Remove="*" />
         <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
 
@@ -90,8 +58,6 @@
         <RuntimeAssetsToRemoveFromDeps Include="tool_nuget" />
       </ItemGroup>
 
-      <Delete Files="@(BinObj)" />
-
       <RemoveDir Directories="$(StageDirectory)" />
       <MakeDir Directories="$(StageDirectory)"/>
 
@@ -110,15 +76,15 @@
           DestinationFiles="@(HackFilesToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
     
     <!-- Publish DotNet -->
-    <DotNetPublish ToolPath="%(Stage.DotnetDir)"
+    <DotNetPublish ToolPath="$(Stage0Directory)"
                    Output="$(SdkOutputDirectory)"
                    Configuration="$(Configuration)"
                    VersionSuffix="$(CommitCount)"
                    ProjectPath="$(SrcDirectory)/redist/redist.csproj"
                    MSBuildArgs="/p:GenerateRuntimeConfigurationFiles=true" />
 
-    <!-- Publish DotNet -->
-    <DotNetPublish ToolPath="%(Stage.DotnetDir)"
+    <!-- Publish Roslyn -->
+    <DotNetPublish ToolPath="$(Stage0Directory)"
                    Output="$(SdkOutputDirectory)/Roslyn"
                    Configuration="$(Configuration)"
                    VersionSuffix="$(CommitCount)"
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
index 276c39d70..dc71e2a16 100644
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -107,7 +107,7 @@
     </Target>
 
     <Target Name="SetupNuGetPackagesArchiveInputsOutputs"
-            DependsOnTargets="Prepare;SetupStage;SetupAzureBlobInformation">
+            DependsOnTargets="Prepare;SetupAzureBlobInformation">
       <PropertyGroup>
         <NugetPackagesArchiveName>nuGetPackagesArchive.$(NuGetPackagesArchiveVersion).lzma</NugetPackagesArchiveName>
         <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>