diff --git a/clr.coreclr.props b/clr.coreclr.props
index 6d3538c341b5..691365c76cfd 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -1,64 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(ClrProduct)'=='core_clr'">
-    <BuildTypeRet Condition="'$(_BuildType)'=='ret'">true</BuildTypeRet>
-    <DebuggingSupported>true</DebuggingSupported>
-    <DebuggingSupportedBuild>true</DebuggingSupportedBuild>
-    <EnCSupported Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</EnCSupported>
-    <EnableDownlevelForNls Condition="'$(CrossTargetArchitecture)' != ''">true</EnableDownlevelForNls>
-    <FeatureCodeVersioning>true</FeatureCodeVersioning>
-    <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
-    <FeatureDbiDebugging>true</FeatureDbiDebugging>
-    <FeatureDbiOopDebugging_HostLocal>false</FeatureDbiOopDebugging_HostLocal>
-    <FeatureDbiOopDebugging_HostWindowsx86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostWindowsx86>
-    <FeatureDbiOopDebugging_HostWindowsamd64 Condition="'$(TargetArch)' == 'amd64' or '$(TargetArch)' == 'arm64'">true</FeatureDbiOopDebugging_HostWindowsamd64>
-    <FeatureDbiOopDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostOneCorex86>
-    <FeatureDbiOopDebugging_HostOneCoreamd64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureDbiOopDebugging_HostOneCoreamd64>
+  <PropertyGroup>
     <FeatureEventTrace>true</FeatureEventTrace>
-    <FeatureTieredCompilation>true</FeatureTieredCompilation>
-    <FeatureFrameworkInternal>true</FeatureFrameworkInternal>
-    <FeatureHijack>true</FeatureHijack>
-    <FeatureInteropDebugging Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureInteropDebugging>
-    <FeatureIsymReader>true</FeatureIsymReader>
-    <!-- This is here for testing purposes only, and only on checked builds for x86/ARM -->
-    <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages>
-    <FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine>
-    <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
-    <FeaturePrejit>true</FeaturePrejit>
-    <FeatureStandaloneSn>true</FeatureStandaloneSn>
-    <FeatureStrongnameDelaySigningAllowed>true</FeatureStrongnameDelaySigningAllowed>
-    <FeatureStrongnameTestkeyAllowed>true</FeatureStrongnameTestkeyAllowed>
-    <FeatureSyntheticCultures>true</FeatureSyntheticCultures>
-    <FeatureVersioningLog>true</FeatureVersioningLog>
-    <FeatureWin32Registry>true</FeatureWin32Registry>
-    <FeatureXPlatDacDebugging_HostWindowsx86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureXPlatDacDebugging_HostWindowsx86>
-    <FeatureXPlatDacDebugging_HostWindowsAMD64 Condition="'$(TargetArch)' == 'amd64' or '$(TargetArch)' == 'arm64'">true</FeatureXPlatDacDebugging_HostWindowsAMD64>
-    <FeatureXPlatDacDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureXPlatDacDebugging_HostOneCorex86>
-    <FeatureXPlatDacDebugging_HostOneCoreAMD64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureXPlatDacDebugging_HostOneCoreAMD64>
-    <ProfilingSupportedBuild>true</ProfilingSupportedBuild>
-    <FeatureUseAsmGCWriteBarriers>true</FeatureUseAsmGCWriteBarriers>
-    <!-- Setting this to "false" works only for workstation GC, not server. -->
-    <FeatureSymDiff>true</FeatureSymDiff>
-    <FeatureClassicCominterop>true</FeatureClassicCominterop>
-    <FeatureCominterop>true</FeatureCominterop>
     <FeatureICastable>true</FeatureICastable>
-    <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
-    <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
-    <FeatureLazyCOWPages Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm')">true</FeatureLazyCOWPages>
-    <FeatureLegacyNetCFDbgHostControl>true</FeatureLegacyNetCFDbgHostControl>
-    <!-- The rejit feature is available only on supported architectures (x86 & x64) -->
-    <FeatureReJIT Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureReJIT>
-    <FeatureManagedEtw>false</FeatureManagedEtw>
     <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels>
-    <BinderDebugLog Condition="'$(_BuildType)'=='dbg'">true</BinderDebugLog>
-    <FeatureAppX>true</FeatureAppX>
-    <FeatureWinMDResilient>true</FeatureWinMDResilient>
-    <!-- 
-        FeatureImplicitTls has been verified to be functionally correct on x86 & amd64.
-        However there is still work to make it on par in terms of performance. So currently only
-        enabling for arm64 
-     -->
-    <FeatureImplicitTls Condition="'$(TargetArch)' == 'arm64'">true</FeatureImplicitTls>
-    <FeatureSvrGc Condition="'$(TargetArch)' != 'arm'">true</FeatureSvrGc>
+
+    <ProfilingSupportedBuild>true</ProfilingSupportedBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
@@ -69,15 +15,6 @@
     <FeatureMulticastStubAsIL>true</FeatureMulticastStubAsIL>
     <FeatureStubsAsIL>true</FeatureStubsAsIL>
 
-    <!-- Windows specific features -->
-    <FeatureWin32Registry>false</FeatureWin32Registry>
-    <FeatureAppX>false</FeatureAppX>
-    <FeatureCominteropApartmentSupport>false</FeatureCominteropApartmentSupport>
-    <FeatureClassicCominterop>false</FeatureClassicCominterop>
-    <FeatureCominterop>false</FeatureCominterop>
-    <FeatureCominteropUnmanagedActivation>false</FeatureCominteropUnmanagedActivation>
-    <FeatureCominteropWinRTManagedActivation>false</FeatureCominteropWinRTManagedActivation>
-
     <FeatureCoreFxGlobalization>true</FeatureCoreFxGlobalization>
   </PropertyGroup>
 
@@ -87,7 +24,13 @@
     <FeatureManagedEtw>true</FeatureManagedEtw>
     <FeatureStubsAsIL Condition="'$(TargetArch)' == 'arm64'">true</FeatureStubsAsIL>
     <FeatureUseLcid>true</FeatureUseLcid>
-    <FeatureImplicitLongPath>true</FeatureImplicitLongPath>
+    <FeatureCominterop>true</FeatureCominterop>
+    <FeatureClassicCominterop>true</FeatureClassicCominterop>
+    <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
+    <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation>
+    <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
+    <FeatureAppX>true</FeatureAppX>
+    <FeatureWin32Registry>true</FeatureWin32Registry>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsLinux)' == 'true'">
diff --git a/clr.defines.targets b/clr.defines.targets
index 64ff2e08705a..7dc442cf1fb9 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -1,41 +1,25 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <DefineConstants Condition="'$(BuildTypeRet)' == 'true'">$(DefineConstants);BUILDTYPE_RET</DefineConstants>
         <DefineConstants Condition="'$(FeatureAppX)' == 'true'">$(DefineConstants);FEATURE_APPX</DefineConstants>
         <DefineConstants Condition="'$(FeatureArrayStubAsIL)' == 'true'">$(DefineConstants);FEATURE_ARRAYSTUB_AS_IL</DefineConstants>
         <DefineConstants Condition="'$(FeatureMulticastStubAsIL)' == 'true'">$(DefineConstants);FEATURE_MULTICASTSTUB_AS_IL</DefineConstants>
         <DefineConstants Condition="'$(FeatureStubsAsIL)' == 'true'">$(DefineConstants);FEATURE_STUBS_AS_IL</DefineConstants>
         <DefineConstants Condition="'$(FeatureClassicCominterop)' == 'true'">$(DefineConstants);FEATURE_CLASSIC_COMINTEROP</DefineConstants>
-        <DefineConstants Condition="'$(FeatureCodeVersioning)' == 'true'">$(DefineConstants);FEATURE_CODE_VERSIONING</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominterop)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropApartmentSupport)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_APARTMENT_SUPPORT</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropUnmanagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_UNMANAGED_ACTIVATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'">$(DefineConstants);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureCoreFxGlobalization)' == 'true'">$(DefineConstants);FEATURE_COREFX_GLOBALIZATION</DefineConstants>
-        <DefineConstants Condition="'$(FeatureDisplayCultureInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_CULTURE_INFO</DefineConstants>
-        <DefineConstants Condition="'$(FeatureDisplayRegionInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_REGION_INFO</DefineConstants>
-        <DefineConstants Condition="'$(FeatureHosting)' == 'true'">$(DefineConstants);FEATURE_HOSTING</DefineConstants>
-        <DefineConstants Condition="'$(FeatureImplicitLongPath)' == 'true'">$(DefineConstants);FEATURE_IMPLICIT_LONGPATH</DefineConstants>
-        <DefineConstants Condition="'$(FeatureIsolatedStorageQuotaEnforcement)' == 'true'">$(DefineConstants);FEATURE_ISOLATED_STORAGE_QUOTA_ENFORCEMENT</DefineConstants>
-        <DefineConstants Condition="'$(FeatureJumpStamp)' == 'true'">$(DefineConstants);FEATURE_JUMPSTAMP</DefineConstants>
-        <DefineConstants Condition="'$(FeatureMacl)' == 'true'">$(DefineConstants);FEATURE_MACL</DefineConstants>
         <DefineConstants Condition="'$(FeatureManagedEtw)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW</DefineConstants>
         <DefineConstants Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW_CHANNELS</DefineConstants>
         <DefineConstants Condition="'$(FeaturePal)' == 'true'">$(DefineConstants);FEATURE_PAL</DefineConstants>
-        <DefineConstants Condition="'$(FeaturePathCompat)' == 'true'">$(DefineConstants);FEATURE_PATHCOMPAT</DefineConstants>
         <DefineConstants Condition="'$(FeaturePerfTracing)' == 'true'">$(DefineConstants);FEATURE_PERFTRACING</DefineConstants>
         <DefineConstants Condition="'$(FeatureXplatEventSource)' == 'true'">$(DefineConstants);FEATURE_EVENTSOURCE_XPLAT</DefineConstants>
-        <DefineConstants Condition="'$(FeatureSortTables)' == 'true'">$(DefineConstants);FEATURE_SORT_TABLES</DefineConstants>
-        <DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
         <DefineConstants Condition="'$(FeatureUseLcid)' == 'true'">$(DefineConstants);FEATURE_USE_LCID</DefineConstants>
-        <DefineConstants Condition="'$(FeatureValidator)' == 'true'">$(DefineConstants);FEATURE_VALIDATOR</DefineConstants>
         <DefineConstants Condition="'$(FeatureWin32Registry)' == 'true'">$(DefineConstants);FEATURE_WIN32_REGISTRY</DefineConstants>
-        <DefineConstants Condition="'$(FeatureWinMDResilient)' == 'true'">$(DefineConstants);FEATURE_WINMD_RESILIENT</DefineConstants>
+
         <DefineConstants Condition="'$(ProfilingSupportedBuild)' == 'true'">$(DefineConstants);PROFILING_SUPPORTED</DefineConstants>
-        <DefineConstants Condition="'$(FeatureReJIT)' == 'true'">$(DefineConstants);FEATURE_REJIT</DefineConstants>
-        <DefineConstants Condition="'$(FeatureUseAsmGCWriteBarriers)' == 'true'">$(DefineConstants);FEATURE_USE_ASM_GC_WRITE_BARRIERS</DefineConstants>
-        <DefineConstants Condition="'$(BinderDebugLog)' == 'true'">$(DefineConstants);BINDER_DEBUG_LOG</DefineConstants>
-        <DefineConstants Condition="'$(FeatureSymDiff)' == 'true'">$(DefineConstants);FEATURE_SYMDIFF</DefineConstants>
+
 
         <DefineConstants Condition="'$(TargetsUnix)' == 'true'">$(DefineConstants);PLATFORM_UNIX</DefineConstants>
         <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);PLATFORM_WINDOWS</DefineConstants>
diff --git a/dac.props b/dac.props
deleted file mode 100644
index 4d158d06adf7..000000000000
--- a/dac.props
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--*****************************************************-->
-  <!--This MSBuild project file was automatically generated-->
-  <!--from the original SOURCES/DIRS file by the KBC tool.-->
-  <!--*****************************************************-->
-  
-  <!--Leaf project Properties-->
-  <PropertyGroup>
-    <ProfilingSupportedBuild >false</ProfilingSupportedBuild>
-    <CDefines>$(CDefines);PROFILING_SUPPORTED_DATA</CDefines>
-    <CDefines>$(CDefines);DACCESS_COMPILE</CDefines>
-    <ExceptionHandling>$(Fullcxxeh)</ExceptionHandling>
-    <LinkNoLibraries>true</LinkNoLibraries>
-    <ClAdditionalOptions>$(ClAdditionalOptions) /d2Zi+</ClAdditionalOptions>
-    <CDefines Condition="'$(_BuildType)' == 'chk' or '$(_BuildType)' == 'dbg'">$(CDefines);_ITERATOR_DEBUG_LEVEL=0</CDefines>
-    <Win32DllLibs Condition="('$(_BuildType)' == 'chk' or '$(_BuildType)' == 'dbg')">$(Win32DllLibs.Replace("libcpmtd.lib","libcpmtd0.lib"))</Win32DllLibs>
-  </PropertyGroup>
-
-  <!-- We link statically against the CRT except on CoreSystem where we link the system CRT which is cheaper
-  to link dynamically. We also enable static linking for the case where we're building DAC targeting
-  CoreSystem but hosted on Windows (BuildForCoreSystem hasn't been target/hostified in the build system yet). -->
-  <PropertyGroup Condition="'$(BuildForCoreSystem)' != 'true' or '$(DacCrossCompileHack)' == 'true'"> 
-    <UseMsvcrt>false</UseMsvcrt>
-    <LinkUseCMT Condition="!('$(_BuildType)' == 'chk' or '$(_BuildType)' == 'dbg')">true</LinkUseCMT>
-  </PropertyGroup>
-
-  <!-- See comment on the PropertyGroup above for an explanation of the condition here. -->
-  <ItemGroup Condition="'$(BuildForCoreSystem)' != 'true' or '$(DacCrossCompileHack)' == 'true'">
-    <TargetLib Condition="('$(_BuildType)' == 'chk' or '$(_BuildType)' == 'dbg')" Include="$(CrtLibPath)\libcpmtd0.lib" />
-    <TargetLib Condition="('$(_BuildType)' == 'chk' or '$(_BuildType)' == 'dbg')" Include="$(CrtLibPath)\libcmtd.lib" />
-    <TargetLib Condition="(!('$(_BuildType)' == 'chk' or '$(_BuildType)' == 'dbg'))" Include="$(CrtLibPath)\libcmt.lib" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/debug/SetDebugTargetCoreSysARM.props b/src/debug/SetDebugTargetCoreSysARM.props
deleted file mode 100644
index cedb5aaf3250..000000000000
--- a/src/debug/SetDebugTargetCoreSysARM.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--*****************************************************-->
-  <!--This MSBuild project file was automatically generated-->
-  <!--from the original SOURCES/DIRS file by the KBC tool.-->
-  <!--*****************************************************-->
-  <!--Import the settings-->
-  <!--Leaf project Properties-->
-  <PropertyGroup>
-    <FeatureDbgipcTransportDI>true</FeatureDbgipcTransportDI>
-    <FeatureDbgipcTransportVM>true</FeatureDbgipcTransportVM>
-    <FeatureIpcman>false</FeatureIpcman>
-    <FeatureInteropDebugging>false</FeatureInteropDebugging>
-
-    <DbgTargetARM>true</DbgTargetARM>
-    <CDefines>$(CDefines);DBG_TARGET_ARM=1</CDefines>
-
-    <DbgTargetCoreSystem>true</DbgTargetCoreSystem>
-    <CDefines>$(CDefines);DBG_TARGET_CORESYSTEM=1</CDefines>
-
-    <DbgTargetSameEndiannes Condition="'$(BuildArchitecture)' == 'i386' or '$(BuildProjectName)' == 'CoreCLR' or '$(BuildProjectName)' == 'CoreSys'">true</DbgTargetSameEndiannes>
-    <CDefines Condition="'$(BuildArchitecture)' == 'i386' or '$(BuildProjectName)' == 'CoreCLR' or '$(BuildProjectName)' == 'CoreSys'">$(CDefines);DBG_TARGET_SAME_ENDIANNESS=1</CDefines>
-  </PropertyGroup>
-  <!--Leaf Project Items-->
-  <!--Import the targets-->
-</Project>
diff --git a/src/debug/SetDebugTargetCoreSysX86.props b/src/debug/SetDebugTargetCoreSysX86.props
deleted file mode 100644
index 594016a0d776..000000000000
--- a/src/debug/SetDebugTargetCoreSysX86.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--*****************************************************-->
-  <!--This MSBuild project file was automatically generated-->
-  <!--from the original SOURCES/DIRS file by the KBC tool.-->
-  <!--*****************************************************-->
-  <!--Import the settings-->
-  <!--Leaf project Properties-->
-  <PropertyGroup>
-    <FeatureDbgipcTransportDI>true</FeatureDbgipcTransportDI>
-    <FeatureDbgipcTransportVM>true</FeatureDbgipcTransportVM>
-    <FeatureIpcman>false</FeatureIpcman>
-    <FeatureInteropDebugging>false</FeatureInteropDebugging>
-
-    <DbgTargetX86>true</DbgTargetX86>
-    <CDefines>$(CDefines);DBG_TARGET_X86=1</CDefines>
-
-    <DbgTargetCoreSystem>true</DbgTargetCoreSystem>
-    <CDefines>$(CDefines);DBG_TARGET_CORESYSTEM=1</CDefines>
-
-  </PropertyGroup>
-  <!--Leaf Project Items-->
-  <!--Import the targets-->
-</Project>
diff --git a/src/debug/SetDebugTargetLocal.props b/src/debug/SetDebugTargetLocal.props
deleted file mode 100644
index 28665150b81b..000000000000
--- a/src/debug/SetDebugTargetLocal.props
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <!--*****************************************************-->
-    <!--This MSBuild project file was automatically generated-->
-    <!--from the original SOURCES/DIRS file by the KBC tool.-->
-    <!--*****************************************************-->
-    <!--Import the settings-->
-    <!--Leaf project Properties-->
-    <PropertyGroup>                
-        <DbgTargetX86 Condition="('$(BuildArchitecture)' == 'i386' or '$(_BuildArch)'=='rotor_x86') and ('$(CrossTargetArchitecture)'=='' or '$(CrossTargetArchitecture)' == 'i386')">1</DbgTargetX86>
-        <CDefines Condition="('$(BuildArchitecture)' == 'i386' or '$(_BuildArch)'=='rotor_x86') and ('$(CrossTargetArchitecture)'=='' or '$(CrossTargetArchitecture)' == 'i386')">$(CDefines);DBG_TARGET_X86=1</CDefines>
-
-        <DbgTargetAmd64 Condition="'$(BuildArchitecture)' == 'amd64' and ('$(CrossTargetArchitecture)'=='' or '$(CrossTargetArchitecture)' == 'amd64')">1</DbgTargetAmd64>
-        <CDefines Condition="'$(BuildArchitecture)' == 'amd64' and ('$(CrossTargetArchitecture)'=='' or '$(CrossTargetArchitecture)' == 'amd64')">$(CDefines);DBG_TARGET_AMD64=1</CDefines>
-
-        <DbgTargetArm Condition="'$(BuildArchitecture)' == 'arm' Or '$(CrossTargetArchitecture)' == 'arm'">1</DbgTargetArm>
-        <CDefines Condition="'$(BuildArchitecture)' == 'arm' Or '$(CrossTargetArchitecture)' == 'arm'">$(CDefines);DBG_TARGET_ARM=1;</CDefines>
-
-        <DbgTargetArm64 Condition="'$(BuildArchitecture)' == 'arm64' Or '$(CrossTargetArchitecture)' == 'arm64'">1</DbgTargetArm64>
-        <CDefines Condition="'$(BuildArchitecture)' == 'arm64' Or '$(CrossTargetArchitecture)' == 'arm64'">$(CDefines);DBG_TARGET_ARM64=1;</CDefines>
-
-        <DbgTargetWin64 Condition="'$(DbgTargetAmd64)' == '1' Or'$(DbgTargetArm64)' == '1'">1</DbgTargetWin64>
-        <CDefines Condition="'$(DbgTargetAmd64)' == '1' Or'$(DbgTargetArm64)' == '1' ">$(CDefines);DBG_TARGET_WIN64=1</CDefines>
-
-        <DbgTarget64bit Condition="'$(DbgTargetWin64)' == '1'">1</DbgTarget64bit>
-        <CDefines Condition="'$(DbgTargetWin64)' == '1'">$(CDefines);DBG_TARGET_64BIT=1</CDefines>
-
-    </PropertyGroup>
-    <!--Leaf Project Items-->
-    <!--Import the targets-->
-</Project>
diff --git a/src/debug/SetDebugTargetWinARM.props b/src/debug/SetDebugTargetWinARM.props
deleted file mode 100644
index 02240f12ca05..000000000000
--- a/src/debug/SetDebugTargetWinARM.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--*****************************************************-->
-  <!--This MSBuild project file was automatically generated-->
-  <!--from the original SOURCES/DIRS file by the KBC tool.-->
-  <!--*****************************************************-->
-  <!--Import the settings-->
-  <!--Leaf project Properties-->
-  <PropertyGroup>
-    <FeatureDbgipcTransportDI>false</FeatureDbgipcTransportDI>
-    <FeatureDbgipcTransportVM>false</FeatureDbgipcTransportVM>
-    <FeatureIpcman>false</FeatureIpcman>
-    <FeatureInteropDebugging>false</FeatureInteropDebugging>
-
-    <DbgTargetArm>true</DbgTargetArm>
-    <CDefines>$(CDefines);DBG_TARGET_ARM=1</CDefines>
-  </PropertyGroup>
-  <!--Leaf Project Items-->
-  <!--Import the targets-->
-</Project>
diff --git a/src/debug/SetDebugTargetWinx86.props b/src/debug/SetDebugTargetWinx86.props
deleted file mode 100644
index bd90a410ab76..000000000000
--- a/src/debug/SetDebugTargetWinx86.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-      
-        <DbgTargetX86>1</DbgTargetX86>
-        <CDefines>$(CDefines);DBG_TARGET_X86=1</CDefines>
-
-    </PropertyGroup>
-</Project>
diff --git a/src/debug/XPlatCommon.props b/src/debug/XPlatCommon.props
deleted file mode 100644
index e7913f8380eb..000000000000
--- a/src/debug/XPlatCommon.props
+++ /dev/null
@@ -1,41 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--Usage: optionally import a clr\xplat\SetHostXXX.props or SetTargetXXX.props first, then this props file -->
-
-
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\xplat\utility.props"/>
-  
-  <PropertyGroup>
-
-    <!-- Is DBI based OOP debugging supported -->
-    <FeatureDbiOopDebugging Condition="'$(XPlatHostBuildDir)'=='HostWinx86'">$(FeatureDbiOopDebugging_HostWindowsx86)</FeatureDbiOopDebugging>
-    <FeatureDbiOopDebugging Condition="'$(XPlatHostBuildDir)'=='HostOneCorex86'">$(FeatureDbiOopDebugging_HostOneCorex86)</FeatureDbiOopDebugging>
-    <FeatureDbiOopDebugging Condition="'$(XPlatHostBuildDir)'=='HostWinAmd64'">$(FeatureDbiOopDebugging_HostWindowsamd64)</FeatureDbiOopDebugging>
-    <FeatureDbiOopDebugging Condition="'$(XPlatHostBuildDir)'=='HostOneCoreAmd64'">$(FeatureDbiOopDebugging_HostOneCoreamd64)</FeatureDbiOopDebugging>
-    <FeatureDbiOopDebugging Condition="'$(XPlatHostBuildDir)'=='HostLocal'">$(FeatureDbiOopDebugging_HostLocal)</FeatureDbiOopDebugging>
-    
-  </PropertyGroup>
-
-  <!-- Additional properties used when DBI based OOP debugging is used -->
-  <PropertyGroup Condition="'$(FeatureDbiOopDebugging)'=='true'">
-
-    <!-- These parameters set up the naming convention for CLRDEBUGINFO resources that are added to clr.dll, these resources have PE information for specific builds
-         of DAC and DBI. The naming scheme started with CLRDEBUGINFO only, but with the advent of x-platform debugging had to be expanded. It is now the general form
-         CLRDEBUGINFO$(DebugInfoResourceHostOS)$(DebugInfoResourceHostArch). To keep back-compat if host==target and target is windows that maps to an empty suffix. These values must be
-         in all capital letters because of weird restrictions on win32 resource names -->
-    <DebugInfoResourceHostOS>UNKNOWN</DebugInfoResourceHostOS>
-    <DebugInfoResourceHostOS Condition="'$(HostMachineOS)'=='windows'">WINDOWS</DebugInfoResourceHostOS>
-    <DebugInfoResourceHostOS Condition="'$(HostMachineOS)'=='OneCore'">CORESYS</DebugInfoResourceHostOS>
-
-    <DebugInfoResourceHostArch>UNKNOWN</DebugInfoResourceHostArch>
-    <DebugInfoResourceHostArch Condition="'$(HostMachineArch)'=='x86'">X86</DebugInfoResourceHostArch>
-    <DebugInfoResourceHostArch Condition="'$(HostMachineArch)'=='arm'">ARM</DebugInfoResourceHostArch>
-    <DebugInfoResourceHostArch Condition="'$(HostMachineArch)'=='amd64'">AMD64</DebugInfoResourceHostArch>
-
-    <DebugInfoResourceSuffixValid Condition="'$(DebugInfoResourceHostArch)'!='UNKNOWN' and '$(DebugInfoResourceHostOS)'!='UNKNOWN'">true</DebugInfoResourceSuffixValid>
-    <DebugInfoResourceSuffix Condition="  '$(TargetMachineOS)'=='windows' and '$(XPlatHostMatchesEnvironment)'=='true' "></DebugInfoResourceSuffix>
-    <DebugInfoResourceSuffix Condition="!('$(TargetMachineOS)'=='windows' and '$(XPlatHostMatchesEnvironment)'=='true')">$(DebugInfoResourceHostOS)$(DebugInfoResourceHostArch)</DebugInfoResourceSuffix>
-
-  </PropertyGroup>
-  
-</Project>
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
index 8793679758aa..919e9c747ac0 100644
--- a/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/mscorlib/System.Private.CoreLib.csproj
@@ -108,8 +108,6 @@
   </PropertyGroup>
   <!-- Msbuild variables needed to get CoreCLR features to be set properly. -->
   <PropertyGroup>
-    <ClrProduct>core_clr</ClrProduct>
-    <BuildForCoreSystem>true</BuildForCoreSystem>
     <!-- These are needed to make sure we have the right set of defines -->
     <TargetArch Condition="'$(Platform)'=='x86'">i386</TargetArch>
     <TargetArch Condition="'$(Platform)'!='x86'">$(Platform)</TargetArch>
@@ -646,7 +644,6 @@
   <Target Name="CDefineChecker" BeforeTargets="Build" Condition="'$(CheckCDefines)'=='true'">
     <!-- Compiler Definition Verification -->
     <PropertyGroup>
-      <IgnoreDefineConstants>FEATURE_IMPLICIT_TLS;FEATURE_HIJACK</IgnoreDefineConstants>
       <CMakeDefinitionSaveFile>$(IntermediateOutputPath)\cmake.definitions</CMakeDefinitionSaveFile>
     </PropertyGroup>
     <Exec Command="python $(MSBuildThisFileDirectory)..\scripts\check-definitions.py &quot;$(CMakeDefinitionSaveFile)&quot; &quot;$(DefineConstants)&quot; &quot;$(IgnoreDefineConstants)&quot; " />