diff --git a/sys/EmulationTargetPDO.cpp b/sys/EmulationTargetPDO.cpp
index c7eb880..289b19c 100644
--- a/sys/EmulationTargetPDO.cpp
+++ b/sys/EmulationTargetPDO.cpp
@@ -32,7 +32,6 @@
 #include <ntstrsafe.h>
 #include <usbioctl.h>
 #include <usbiodef.h>
-#include <ViGEmBusDriver.h>
 
 
 PCWSTR ViGEm::Bus::Core::EmulationTargetPDO::_deviceLocation = L"Virtual Gamepad Emulation Bus";
@@ -70,32 +69,6 @@ NTSTATUS ViGEm::Bus::Core::EmulationTargetPDO::PdoCreateDevice(WDFDEVICE ParentD
 
 	do
 	{
-#pragma region Enter RAW device mode
-
-		status = WdfPdoInitAssignRawDevice(DeviceInit, &GUID_DEVCLASS_VIGEM_RAWPDO);
-		if (!NT_SUCCESS(status))
-		{
-			TraceEvents(TRACE_LEVEL_ERROR,
-				TRACE_BUSPDO,
-				"WdfPdoInitAssignRawDevice failed with status %!STATUS!",
-				status);
-			break;
-		}
-
-		WdfDeviceInitSetCharacteristics(DeviceInit, FILE_AUTOGENERATED_DEVICE_NAME, TRUE);
-
-		status = WdfDeviceInitAssignSDDLString(DeviceInit, &SDDL_DEVOBJ_SYS_ALL_ADM_RWX_WORLD_RWX_RES_RWX);
-		if (!NT_SUCCESS(status))
-		{
-			TraceEvents(TRACE_LEVEL_ERROR,
-				TRACE_BUSPDO,
-				"WdfDeviceInitAssignSDDLString failed with status %!STATUS!",
-				status);
-			break;
-		}
-
-#pragma endregion
-
 #pragma region Prepare PDO
 
 		status = this->PdoPrepareDevice(DeviceInit, &deviceId, &deviceDescription);
diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj
index 7a6d373..e170324 100644
--- a/sys/ViGEmBus.vcxproj
+++ b/sys/ViGEmBus.vcxproj
@@ -184,7 +184,6 @@
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmBusDriver.h" />
     <ClInclude Include="..\client\include\ViGEm\km\BusShared.h" />
     <ClInclude Include="busenum.h" />
     <ClInclude Include="CRTCPP.hpp" />
diff --git a/sys/ViGEmBus.vcxproj.filters b/sys/ViGEmBus.vcxproj.filters
index 2016129..2ecab0e 100644
--- a/sys/ViGEmBus.vcxproj.filters
+++ b/sys/ViGEmBus.vcxproj.filters
@@ -17,9 +17,6 @@
       <UniqueIdentifier>{8E41214B-6785-4CFE-B992-037D68949A14}</UniqueIdentifier>
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
     </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{bbf85b1d-5a75-4302-af4e-46627fcf0d78}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\Targets">
       <UniqueIdentifier>{b00da32a-ce46-490d-9e77-95bb90925995}</UniqueIdentifier>
     </Filter>
@@ -36,9 +33,6 @@
     <ClInclude Include="busenum.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\Include\ViGEmBusDriver.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
     <ClInclude Include="trace.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/sys/busenum.h b/sys/busenum.h
index 722e47c..8b99933 100644
--- a/sys/busenum.h
+++ b/sys/busenum.h
@@ -33,7 +33,6 @@
 #define NTSTRSAFE_LIB
 #include <ntstrsafe.h>
 #include <initguid.h>
-#include "ViGEmBusDriver.h"
 #include <ViGEm/km/BusShared.h>
 #include "Queue.hpp"