diff --git a/Binary/win32/SDL.dll b/Binary/win32/SDL.dll
deleted file mode 100644
index ec6d2d845a..0000000000
Binary files a/Binary/win32/SDL.dll and /dev/null differ
diff --git a/Binary/win32/wiiuse.dll b/Binary/win32/wiiuse.dll
deleted file mode 100644
index 6b52becf21..0000000000
Binary files a/Binary/win32/wiiuse.dll and /dev/null differ
diff --git a/Binary/x64/SDL.dll b/Binary/x64/SDL.dll
deleted file mode 100644
index 0ee6467b6d..0000000000
Binary files a/Binary/x64/SDL.dll and /dev/null differ
diff --git a/Binary/x64/wiiuse.dll b/Binary/x64/wiiuse.dll
deleted file mode 100644
index 24905a297d..0000000000
Binary files a/Binary/x64/wiiuse.dll and /dev/null differ
diff --git a/Binary/win32/cg.dll b/Externals/Cg/cg.dll
similarity index 100%
rename from Binary/win32/cg.dll
rename to Externals/Cg/cg.dll
diff --git a/Binary/win32/cgGL.dll b/Externals/Cg/cgGL.dll
similarity index 100%
rename from Binary/win32/cgGL.dll
rename to Externals/Cg/cgGL.dll
diff --git a/Binary/x64/cg.dll b/Externals/Cg64/cg.dll
similarity index 100%
rename from Binary/x64/cg.dll
rename to Externals/Cg64/cg.dll
diff --git a/Binary/x64/cgGL.dll b/Externals/Cg64/cgGL.dll
similarity index 100%
rename from Binary/x64/cgGL.dll
rename to Externals/Cg64/cgGL.dll
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index f0dceb1549..e4a84ba5a2 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -127,7 +127,7 @@
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
index 01d20986fa..156c8e2591 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
@@ -197,6 +197,13 @@ void PAD_Shutdown()
#endif
#ifdef _WIN32
dinput.Free();
+ // Kill xpad rumble
+ XINPUT_VIBRATION vib;
+ vib.wLeftMotorSpeed = 0;
+ vib.wRightMotorSpeed = 0;
+ for (int i = 0; i < 4; i++)
+ if (pad[i].bRumble)
+ XInputSetState(pad[i].XPadPlayer, &vib);
#endif
SaveConfig();
}