diff --git a/source/frontend/options.cpp b/source/frontend/options.cpp
index 084290006..18cea17d5 100644
--- a/source/frontend/options.cpp
+++ b/source/frontend/options.cpp
@@ -104,7 +104,7 @@
 
 int	CFrontEndOptions::s_controlStyleValues[CPadConfig::NUM_PAD_CONFIGS+1]=
 {
-	0,1,2,3,
+	0,1,2,
 	-1
 };
 CGUITextReadout::TextReadoutData CFrontEndOptions::s_controlStyleReadoutText[CPadConfig::NUM_PAD_CONFIGS]=
@@ -112,7 +112,6 @@ CGUITextReadout::TextReadoutData CFrontEndOptions::s_controlStyleReadoutText[CPa
 	{	0,STR__FRONTEND__A	},
 	{	1,STR__FRONTEND__B	},
 	{	2,STR__FRONTEND__C	},
-	{	3,STR__FRONTEND__D	},
 };
 
 
diff --git a/source/pad/pads.cpp b/source/pad/pads.cpp
index fe748f420..6aea5b1fb 100644
--- a/source/pad/pads.cpp
+++ b/source/pad/pads.cpp
@@ -486,23 +486,10 @@ CPadConfig::sPadConfigTable	CPadConfig::s_padConfigs[NUM_PAD_CONFIGS]=
 		PAD_UP,				// PAD_CFG_UP
 		PAD_DOWN,			// PAD_CFG_DOWN
 
-		PAD_CIRCLE,			// PAD_CFG_FIRE
-		PAD_CROSS,			// PAD_CFG_CATCH
-		PAD_TRIANGLE,		// PAD_CFG_JUMP
-		PAD_SQUARE,			// PAD_CFG_WEAPONCHANGE
-	}},
-	// Config D
-	{{
-		0,					// PAD_CFG_NONE
-		PAD_SQUARE,			// PAD_CFG_LEFT
-		PAD_CIRCLE,			// PAD_CFG_RIGHT
-		PAD_TRIANGLE,		// PAD_CFG_UP
-		PAD_CROSS,			// PAD_CFG_DOWN
-
-		PAD_LEFT,			// PAD_CFG_FIRE
-		PAD_UP,				// PAD_CFG_CATCH
-		PAD_DOWN,			// PAD_CFG_JUMP
-		PAD_RIGHT,			// PAD_CFG_WEAPONCHANGE
+		PAD_SQUARE,			// PAD_CFG_FIRE
+		PAD_CIRCLE,			// PAD_CFG_CATCH
+		PAD_CROSS,			// PAD_CFG_JUMP
+		PAD_TRIANGLE,		// PAD_CFG_WEAPONCHANGE
 	}},
 };
 
diff --git a/source/pad/pads.h b/source/pad/pads.h
index 9d8690071..83863903a 100644
--- a/source/pad/pads.h
+++ b/source/pad/pads.h
@@ -104,7 +104,7 @@ class	CPadConfig
 public:
 	enum
 	{
-		NUM_PAD_CONFIGS=4,
+		NUM_PAD_CONFIGS=3,
 	};
 
 	enum	PAD_CFG