diff --git a/AutoSetup.bat b/AutoSetup.bat
deleted file mode 100644
index e67c22f..0000000
--- a/AutoSetup.bat
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo off
-REM LLVM 4+ MSBuild 15 Integration
-REM Creation Date: 07-11-2017
-REM Update Date: 28-03-2017 
-REM If you haven't received a copy of the LICENSe, See: Uol-NCSA License
-
-set VS_REGVAL=15.0
-
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set VS_REGKEY=HKLM\Software\WOW6432Node\Microsoft\VisualStudio\SxS\VS7)
-if not "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set VS_REGKEY=HKLM\Software\Microsoft\VisualStudio\SxS\VS7)
-
-reg query %VS_REGKEY% /v %VS_REGVAL% 2>nul || (echo No vs2017 registry key present! & exit /b 1)
-
-set VS_DIR=
-for /f "tokens=2,*" %%a in ('reg query %VS_REGKEY% /v %VS_REGVAL% ^| findstr %VS_REGVAL%') do (
-    set VS_DIR=%%b
-)
-
-if not defined VS_DIR (echo Cannot find Visual Studio 2017 directory! & exit /b 1)
-
-set VS_PROOT_DIR=%VS_DIR%\Common7\IDE\VC\VCTargets\Platforms
-
-if not exist "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017" (mkdir "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017")
-if not exist "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017_xp" (mkdir "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017_xp")
-copy Toolset-llvm-vs2017-x86.props "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017\Toolset.props"
-copy Toolset-llvm-vs2017-x86.targets "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017\Toolset.targets"
-copy Toolset-llvm-vs2017-xp-x86.props "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017_xp\Toolset.props"
-copy Toolset-llvm-vs2017-xp-x86.targets "%VS_PROOT_DIR%\Win32\PlatformToolsets\LLVM-vs2017_xp\Toolset.targets"
-
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto install_x64
-if not "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto done
-
-:install_x64
-if not exist "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017" (mkdir "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017")
-if not exist "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017_xp" (mkdir "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017_xp")
-copy Toolset-llvm-vs2017-x64.props "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017\Toolset.props"
-copy Toolset-llvm-vs2017-x64.targets "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017\Toolset.targets"
-copy Toolset-llvm-vs2017-xp-x64.props "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017_xp\Toolset.props"
-copy Toolset-llvm-vs2017-xp-x64.targets "%VS_PROOT_DIR%\x64\PlatformToolsets\LLVM-vs2017_xp\Toolset.targets"
-goto done
-
-:done
-echo Setup OK!
-pause
diff --git a/README.MD b/README.MD
index 5ef4368..46bc05a 100644
--- a/README.MD
+++ b/README.MD
@@ -1,34 +1,16 @@
 # LLVM Visual Studio 2017 Integration
 
-### Automatic Installation
+This repository contains Visual Studio 2017 integration for various LLVM versions.
 
-Open a command prompt with Administrator rights (DO NOT OPEN AutoSetup.bat with admin rights it won't load the files)
+Pull requests for new versions are welcome, just create a branch and adjust the configuration.
 
-Go to the folder where AutoSetup.bat exists and type "AutoSetup"
+### How to use it?
+Simply fork the branch related to your version
 
-### Manual Installation (If Automatic dosen't work)
-
-Go to "[Your Visual Studio Installation Directory]\Common7\IDE\VC\VCTargets\Platforms"
-
-##### Performing x86 Toolset installation
-- Go to Win32\PlatformToolset
-- Create 2 folders called LLVM-vs2017 and LLVM-vs2017_xp
-- Go to LLVM-vs2017
-- Copy all files that starts with Toolset-llvm-vs2017-x86
-- Rename the name of all this files (not the extensions) into Toolset
-- Now go to LLVM-vs2017_xp
-- Copy all files that starts with Toolset-llvm-vs2017-xp-x86
-- Rename the name of all this files (not the extensions) into Toolset
-
-##### Performing x64 Toolset installation
-- Go to x64\PlatformToolset
-- Create 2 folders called LLVM-vs2017 and LLVM-vs2017_xp
-- Go to LLVM-vs2017
-- Copy all files that starts with Toolset-llvm-vs2017-x64
-- Rename the name of all this files (not the extensions) into Toolset
-- Now go to LLVM-vs2017_xp
-- Copy all files that starts with Toolset-llvm-vs2017-xp-x64
-- Rename the name of all this files (not the extensions) into Toolset
+| LLVM Version | Branch |
+| ------------ | ------ |
+| 5.0.0        | v5.0   |
+| 6.0.0        | v6.0   |
 
 ### LICENSE
 
diff --git a/Toolset-llvm-vs2017-x64.props b/Toolset-llvm-vs2017-x64.props
deleted file mode 100644
index 429895b..0000000
--- a/Toolset-llvm-vs2017-x64.props
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
-  <Import Project="$(MSBuildThisFileDirectory)ImportBefore\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportBefore')" />
-
-  <PropertyGroup>
-    <!-- Required for enabling Team Build for packaging Windows Store app projects -->
-    <OutDirWasSpecified Condition=" '$(OutDir)'!='' AND '$(OutDirWasSpecified)'=='' ">true</OutDirWasSpecified>
-    <OutDirWasSpecified Condition=" '$(OutDir)'=='' AND '$(OutDirWasSpecified)'=='' ">false</OutDirWasSpecified>
-
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props')"/>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" />
-
-  <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
-    <IncludePath Condition="'$(IncludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x64);</ReferencePath>
-    <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
-    <LibraryWPath Condition="'$(LibraryWPath)' == ''">$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath Condition="'$(SourcePath)' == ''">$(VC_SourcePath);</SourcePath>
-    <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x64</DebugCppRuntimeFilesPath>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)ImportAfter\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportAfter')" />
-  
-  <!-- This is intentially added after ImportAfter. -->
-  <Import Project="$(_PlatformFolder)Platform.Common.props" />
-
-  <PropertyGroup>
-    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
-    <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
-    <ExecutablePath>$(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>
-    <LibraryPath>$(LLVMInstallDir)\lib\clang\5.0\lib\windows;$(LibraryPath)</LibraryPath>                      
-    <VCToolArchitecture>Native64Bit</VCToolArchitecture>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Set the value of _MSC_VER to claim for compatibility -->
-      <AdditionalOptions>-m64 -fmsc-version=1910 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/Toolset-llvm-vs2017-x64.targets b/Toolset-llvm-vs2017-x64.targets
deleted file mode 100644
index 05b59a2..0000000
--- a/Toolset-llvm-vs2017-x64.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
-</Project>
diff --git a/Toolset-llvm-vs2017-x86.props b/Toolset-llvm-vs2017-x86.props
deleted file mode 100644
index b5462ad..0000000
--- a/Toolset-llvm-vs2017-x86.props
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
-  <Import Project="$(MSBuildThisFileDirectory)ImportBefore\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportBefore')" />
-
-  <PropertyGroup>
-    <!-- Required for enabling Team Build for packaging Windows Store app projects -->
-    <OutDirWasSpecified Condition=" '$(OutDir)'!='' AND '$(OutDirWasSpecified)'=='' ">true</OutDirWasSpecified>
-    <OutDirWasSpecified Condition=" '$(OutDir)'=='' AND '$(OutDirWasSpecified)'=='' ">false</OutDirWasSpecified>
-
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props')"/>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" />
-
-  <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
-    <IncludePath Condition="'$(IncludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x86);</ReferencePath>
-    <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <LibraryWPath Condition="'$(LibraryWPath)' == ''">$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath Condition="'$(SourcePath)' == ''">$(VC_SourcePath);</SourcePath>
-    <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x86</DebugCppRuntimeFilesPath>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)ImportAfter\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportAfter')" />
-  
-  <!-- This is intentially added after ImportAfter. -->
-  <Import Project="$(_PlatformFolder)Platform.Common.props" />
-
-  <PropertyGroup>
-    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
-    <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
-    <ExecutablePath>$(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>
-    <LibraryPath>$(LLVMInstallDir)\lib\clang\5.0\lib\windows;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Set the value of _MSC_VER to claim for compatibility -->
-      <AdditionalOptions>-m32 -fmsc-version=1910 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/Toolset-llvm-vs2017-x86.targets b/Toolset-llvm-vs2017-x86.targets
deleted file mode 100644
index 05b59a2..0000000
--- a/Toolset-llvm-vs2017-x86.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
-</Project>
diff --git a/Toolset-llvm-vs2017-xp-x64.props b/Toolset-llvm-vs2017-xp-x64.props
deleted file mode 100644
index e1056c0..0000000
--- a/Toolset-llvm-vs2017-xp-x64.props
+++ /dev/null
@@ -1,68 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
-  <Import Project="$(MSBuildThisFileDirectory)ImportBefore\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportBefore')" />
-
-  <PropertyGroup>
-    <!-- Required for enabling Team Build for packaging Windows Store app projects -->
-    <OutDirWasSpecified Condition=" '$(OutDir)'!='' AND '$(OutDirWasSpecified)'=='' ">true</OutDirWasSpecified>
-    <OutDirWasSpecified Condition=" '$(OutDir)'=='' AND '$(OutDirWasSpecified)'=='' ">false</OutDirWasSpecified>
-
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-
-    <DefineWindowsSDK_71A>true</DefineWindowsSDK_71A>
-	<!-- For desktop projects targeting XP, override the SDKDisplayName and WindowsTargetPlatformVersion to windows 7.0 so that the correct TPI and TPV are displayed in the UI -->
-    <SDKDisplayName>Windows</SDKDisplayName>
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" />
-
-
-  <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x64);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
-    <IncludePath Condition="'$(IncludePath)' == ''">$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
-    <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x64);</ReferencePath>
-    <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);</LibraryPath>
-    <SourcePath Condition="'$(SourcePath)' == ''">$(VC_SourcePath);</SourcePath>
-    <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x64</DebugCppRuntimeFilesPath>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Add /D_USING_V110_SDK71_ when targeting XP -->
-      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <!-- For legacy reasons, the resource editor doesn't send any defines to the resource compiler.  This property allows for
-           sending special options to solve issues that are known to not introduce other problems that arbitrary defines may cause. -->
-      <DesigntimePreprocessorDefinitions>_USING_V110_SDK71_;%(DesigntimePreprocessorDefinitions)</DesigntimePreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)ImportAfter\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportAfter')" />
-
-  <!-- This is intentially added after ImportAfter. -->
-  <Import Project="$(_PlatformFolder)Platform.Common.props" />
-  
-  <PropertyGroup>
-    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
-    <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
-    <ExecutablePath>$(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>
-    <LibraryPath>$(LLVMInstallDir)\lib\clang\5.0\lib\windows;$(LibraryPath)</LibraryPath>
-    <VCToolArchitecture>Native64Bit</VCToolArchitecture>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Set the value of _MSC_VER to claim for compatibility -->
-      <AdditionalOptions>-m64 -fmsc-version=1910 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/Toolset-llvm-vs2017-xp-x64.targets b/Toolset-llvm-vs2017-xp-x64.targets
deleted file mode 100644
index eec4f18..0000000
--- a/Toolset-llvm-vs2017-xp-x64.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Force TargetFrameworkVersion to v4.0 to support XP-->
-  <PropertyGroup>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <BeforeClCompileTargets>NoSupportCodeAnalysisXP;$(BeforeClCompileTargets)</BeforeClCompileTargets>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
-
-  <Target Name="NoSupportCodeAnalysisXP" Condition="'$(ErrorNoSupportCodeAnalysisXP)' != 'false'">
-    <VCMessage Condition="'$(DesignTimeBuild)' != 'true' and '@(ClCompile->AnyHaveMetadataValue('EnablePREfast', 'true'))'=='true'" Code="MSB8026" Type="Error"/>
-  </Target>
-
-  <PropertyGroup>
-    <PrepareForBuildDependsOn>CheckWindowsSDK71A;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
-  </PropertyGroup>
-
-  <Target Name="CheckWindowsSDK71A">
-    <VCMessage Code="MSB8003" Type="Warning" Arguments="WindowsSdkDir_71A" Condition="'$(WindowsSdkDir_71A)'=='' and '$(UseEnv)' != 'true'" />
-  </Target>
-</Project>
diff --git a/Toolset-llvm-vs2017-xp-x86.props b/Toolset-llvm-vs2017-xp-x86.props
deleted file mode 100644
index bb91d6f..0000000
--- a/Toolset-llvm-vs2017-xp-x86.props
+++ /dev/null
@@ -1,67 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
-  <Import Project="$(MSBuildThisFileDirectory)ImportBefore\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportBefore')" />
-
-  <PropertyGroup>
-    <!-- Required for enabling Team Build for packaging Windows Store app projects -->
-    <OutDirWasSpecified Condition=" '$(OutDir)'!='' AND '$(OutDirWasSpecified)'=='' ">true</OutDirWasSpecified>
-    <OutDirWasSpecified Condition=" '$(OutDir)'=='' AND '$(OutDirWasSpecified)'=='' ">false</OutDirWasSpecified>
-
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>
-    <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-
-    <DefineWindowsSDK_71A>true</DefineWindowsSDK_71A>
-	<!-- For desktop projects targeting XP, override the SDKDisplayName and WindowsTargetPlatformVersion to windows 7.0 so that the correct TPI and TPV are displayed in the UI -->
-    <SDKDisplayName>Windows</SDKDisplayName>
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" />
-
-
-  <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
-    <IncludePath Condition="'$(IncludePath)' == ''">$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
-    <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x86);</ReferencePath>
-    <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
-    <SourcePath Condition="'$(SourcePath)' == ''">$(VC_SourcePath);</SourcePath>
-    <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x86</DebugCppRuntimeFilesPath>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Add /D_USING_V110_SDK71_ when targeting XP -->
-      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <!-- For legacy reasons, the resource editor doesn't send any defines to the resource compiler.  This property allows for
-           sending special options to solve issues that are known to not introduce other problems that arbitrary defines may cause. -->
-      <DesigntimePreprocessorDefinitions>_USING_V110_SDK71_;%(DesigntimePreprocessorDefinitions)</DesigntimePreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)ImportAfter\*.props" Condition="Exists('$(MSBuildThisFileDirectory)ImportAfter')" />
-
-  <!-- This is intentially added after ImportAfter. -->
-  <Import Project="$(_PlatformFolder)Platform.Common.props" />
-  
-  <PropertyGroup>
-    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
-    <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
-    <ExecutablePath>$(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>
-    <LibraryPath>$(LLVMInstallDir)\lib\clang\5.0\lib\windows;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Set the value of _MSC_VER to claim for compatibility -->
-      <AdditionalOptions>-m32 -fmsc-version=1910 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/Toolset-llvm-vs2017-xp-x86.targets b/Toolset-llvm-vs2017-xp-x86.targets
deleted file mode 100644
index eec4f18..0000000
--- a/Toolset-llvm-vs2017-xp-x86.targets
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Force TargetFrameworkVersion to v4.0 to support XP-->
-  <PropertyGroup>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <BeforeClCompileTargets>NoSupportCodeAnalysisXP;$(BeforeClCompileTargets)</BeforeClCompileTargets>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
-
-  <Target Name="NoSupportCodeAnalysisXP" Condition="'$(ErrorNoSupportCodeAnalysisXP)' != 'false'">
-    <VCMessage Condition="'$(DesignTimeBuild)' != 'true' and '@(ClCompile->AnyHaveMetadataValue('EnablePREfast', 'true'))'=='true'" Code="MSB8026" Type="Error"/>
-  </Target>
-
-  <PropertyGroup>
-    <PrepareForBuildDependsOn>CheckWindowsSDK71A;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
-  </PropertyGroup>
-
-  <Target Name="CheckWindowsSDK71A">
-    <VCMessage Code="MSB8003" Type="Warning" Arguments="WindowsSdkDir_71A" Condition="'$(WindowsSdkDir_71A)'=='' and '$(UseEnv)' != 'true'" />
-  </Target>
-</Project>