diff --git a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj
index 3fbb733f..8a6b9410 100644
--- a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj
+++ b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj
@@ -11,7 +11,6 @@
   <Import Project="$(SolutionDir)\Rainmeter.props" />
   <Import Project="$(SolutionDir)\Plugins\Plugins.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -145,7 +144,6 @@
     <ClCompile Include="taglib\toolkit\unicode.cpp" />
     <ClCompile Include="taglib\wavpack\wavpackfile.cpp" />
     <ClCompile Include="taglib\wavpack\wavpackproperties.cpp" />
-    <ClCompile Include="XPATL.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Cover.h" />
@@ -172,20 +170,7 @@
   <ItemGroup>
     <ResourceCompile Include="PluginNowPlaying.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <MASM Include="XPATLx64.asm">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </MASM>
-    <MASM Include="XPATLx86.asm">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </MASM>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj.filters b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj.filters
index 6ae693fa..7eda38c5 100644
--- a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj.filters
+++ b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj.filters
@@ -25,9 +25,6 @@
     <Filter Include="Source Files">
       <UniqueIdentifier>{abad9374-731c-48b4-8ae1-45793b348013}</UniqueIdentifier>
     </Filter>
-    <Filter Include="XPATL">
-      <UniqueIdentifier>{d22781ac-b5c3-48db-b89f-3429215cc8cf}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SDKs\iTunes\iTunesCOMInterface_i.c">
@@ -273,9 +270,6 @@
     <ClCompile Include="Internet.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="XPATL.cpp">
-      <Filter>XPATL</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="SDKs\AIMP\aimp2_sdk.h">
@@ -344,12 +338,4 @@
       <Filter>Source Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <MASM Include="XPATLx86.asm">
-      <Filter>XPATL</Filter>
-    </MASM>
-    <MASM Include="XPATLx64.asm">
-      <Filter>XPATL</Filter>
-    </MASM>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Plugins/PluginNowPlaying/XPATL.cpp b/Plugins/PluginNowPlaying/XPATL.cpp
deleted file mode 100644
index fa8d48e7..00000000
--- a/Plugins/PluginNowPlaying/XPATL.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (c) 2013 Mike Ryan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-
-
-// XPSupport ATL Wrappers (for VC2012 Update 2)
-// Written by Mike Ryan (aka Ted.)
-// http://tedwvc.wordpress.com
-
-// 2013-04-14 1.00 initial release to wrap InitializeCriticalSectionEx
-// 2013-04-15 1.01 added x64 asm file (no change to CPP file)
-// 2013-04-17 1.02 cleaned up Vista check (was triggering RTCs)
-
-#include "StdAfx.h"
-
-bool Is_VistaOrLater() {
-    DWORD version = ::GetVersion();
-    DWORD major = (DWORD) (LOBYTE(LOWORD(version)));
-
-    return (major >= 6);
-}
-
-typedef BOOL (WINAPI *pInitializeCriticalSectionEx)(__out  LPCRITICAL_SECTION lpCriticalSection, __in   DWORD dwSpinCount, __in   DWORD Flags);
-
-extern "C" BOOL WINAPI VC11Update2InitializeCriticalSectionEx(__out  LPCRITICAL_SECTION lpCriticalSection, __in   DWORD dwSpinCount, __in   DWORD Flags)
-{
-	static pInitializeCriticalSectionEx InitializeCriticalSectionEx_p = NULL;
-
-	if (Is_VistaOrLater()) { // Vista or higher
-		if (!InitializeCriticalSectionEx_p) { 
-			HMODULE mod = GetModuleHandle(L"KERNEL32.DLL");
-			if (mod) 
-				InitializeCriticalSectionEx_p = (pInitializeCriticalSectionEx) GetProcAddress(mod, "InitializeCriticalSectionEx");
-		}
-		return InitializeCriticalSectionEx_p(lpCriticalSection, dwSpinCount, Flags);
-	} 
-
-	// on XP we'll use InitializeCrticialSectionAndSpinCount
-	return ::InitializeCriticalSectionAndSpinCount(lpCriticalSection, dwSpinCount);
-}
diff --git a/Plugins/PluginNowPlaying/XPATLx64.asm b/Plugins/PluginNowPlaying/XPATLx64.asm
deleted file mode 100644
index ae16cbe1..00000000
--- a/Plugins/PluginNowPlaying/XPATLx64.asm
+++ /dev/null
@@ -1,34 +0,0 @@
-;Copyright (c) 2013 Mike Ryan
-
-;Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-;and associated documentation files (the "Software"), to deal in the Software without restriction,
-;including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-;and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-;subject to the following conditions:
-
-;The above copyright notice and this permission notice shall be included in all copies or substantial
-;portions of the Software.
-
-;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
-;LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-;IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-;WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-;OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-
-__ML_64 = OPATTR rax
-
-IF __ML_64
-
-VC11Update2InitializeCriticalSectionEx PROTO :QWORD,:DWORD,:DWORD
- 
-.data
- __imp_InitializeCriticalSectionEx dq VC11Update2InitializeCriticalSectionEx
-
- EXTERNDEF __imp_InitializeCriticalSectionEx : DWORD
-
-.code
-
-ENDIF
- 
-end
-
diff --git a/Plugins/PluginNowPlaying/XPATLx86.asm b/Plugins/PluginNowPlaying/XPATLx86.asm
deleted file mode 100644
index 66bb2c2a..00000000
--- a/Plugins/PluginNowPlaying/XPATLx86.asm
+++ /dev/null
@@ -1,42 +0,0 @@
-;Copyright (c) 2013 Mike Ryan
-
-;Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-;and associated documentation files (the "Software"), to deal in the Software without restriction,
-;including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-;and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-;subject to the following conditions:
-
-;The above copyright notice and this permission notice shall be included in all copies or substantial
-;portions of the Software.
-
-;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
-;LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-;IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-;WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-;OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-
-__ML_64 = OPATTR rax
-
-IF __ML_64
-ELSE
-
-.model flat, C 
-
-
-VC11Update2InitializeCriticalSectionEx PROTO STDCALL :DWORD,:DWORD,:DWORD
- 
-.data
-
- __imp__InitializeCriticalSectionEx@12 dd VC11Update2InitializeCriticalSectionEx
-
- EXTERNDEF __imp__InitializeCriticalSectionEx@12 : DWORD
-
-.code
-
-ENDIF 
-
-end
-
-
-
-