diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
index d82ffa0e40..ebecb3886b 100644
--- a/Source/Core/Common/CommonPaths.h
+++ b/Source/Core/Common/CommonPaths.h
@@ -151,9 +151,7 @@
 
 #define GECKO_CODE_HANDLER "codehandler.bin"
 
-#define GECKO_CODE_HANDLER_MPN "codehandler-mpn.bin"
-
-#define GECKO_CODE_HANDLER_MPN_SUPER "codehandler.bin" // MPN Codehanlder is breaking some textures. 
+#define GECKO_CODE_HANDLER_MPN "codehandler.bin"
 
 // Subdirs in Sys
 #define GC_SYS_DIR "GC"
diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp
index b83cbc0ca2..2480744b93 100644
--- a/Source/Core/Core/GeckoCode.cpp
+++ b/Source/Core/Core/GeckoCode.cpp
@@ -117,8 +117,6 @@ const char* GetGeckoCodeHandlerPath()
     return GECKO_CODE_HANDLER;  // Dolphin (Stock)
   case 1:
     return GECKO_CODE_HANDLER_MPN;  // MPN (Extended)
-  case 2:
-    return GECKO_CODE_HANDLER_MPN_SUPER;  // MPN (Super Extended)
   default:
     return GECKO_CODE_HANDLER;  // Fallback
   }
@@ -127,10 +125,10 @@ const char* GetGeckoCodeHandlerPath()
 bool IsGeckoCodeHandlerEnabled()
 {
   int code_handler_value = Config::Get(Config::MAIN_CODE_HANDLER);
-  return code_handler_value == 1 || code_handler_value == 2;
+  return code_handler_value == 1;
 }
 
-bool IsGeckoCodeHandlerSUPER()
+bool IsGeckoCodeHandlerMPN()
 {
   int code_handler_value = Config::Get(Config::MAIN_CODE_HANDLER);
   return code_handler_value == 2;
@@ -176,15 +174,15 @@ static Installation InstallCodeHandlerLocked(const Core::CPUThreadGuard& guard)
   }
 
   const bool is_mpn_handler_and_game_id_rm8e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "RM8E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "RM8E01");
   const bool is_mpn_handler_and_game_id_gp7e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP7E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP7E01");
   const bool is_mpn_handler_and_game_id_gp6e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP6E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP6E01");
   const bool is_mpn_handler_and_game_id_gp5e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP5E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP5E01");
   const bool is_mpn_handler_and_game_id_gmpe01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GMPE01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GMPE01");
 
   u32 codelist_base_address =
       is_mpn_handler_and_game_id_rm8e01 ? INSTALLER_BASE_ADDRESS_MP8 :
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
index 1bf76eed4b..4779d5309b 100644
--- a/Source/Core/Core/HLE/HLE.cpp
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -86,7 +86,6 @@ const char* GetGeckoCodeHandlerPath()
   {
     case 0: return GECKO_CODE_HANDLER; // Dolphin (Stock)
     case 1: return GECKO_CODE_HANDLER_MPN; // MPN (Extended)
-    case 2: return GECKO_CODE_HANDLER_MPN_SUPER; // MPN (Super Extended)
     default: return GECKO_CODE_HANDLER; // Fallback
   }
 }
@@ -94,13 +93,13 @@ const char* GetGeckoCodeHandlerPath()
 bool IsGeckoCodeHandlerEnabled()
 {
   int code_handler_value = Config::Get(Config::MAIN_CODE_HANDLER); // Get the integer value
-  return code_handler_value == 1 || code_handler_value == 2; // Return true for 1 and 2
+  return code_handler_value == 1; // Return true for 1 and 2
 }
 
-bool IsGeckoCodeHandlerSUPER()
+bool IsGeckoCodeHandlerMPN()
 {
   int code_handler_value = Config::Get(Config::MAIN_CODE_HANDLER); // Get the integer value
-  return code_handler_value == 2; // Return true for 1 and 2
+  return code_handler_value == 1;
 }
 
 void PatchFixedFunctions(Core::System& system)
@@ -126,11 +125,11 @@ void PatchFixedFunctions(Core::System& system)
   // this, and it doesn't clear the icache properly.
 
   const bool is_mpn_handler_and_game_id_gp7e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP7E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP7E01");
   const bool is_mpn_handler_and_game_id_gp6e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP6E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP6E01");
   const bool is_mpn_handler_and_game_id_gp5e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP5E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP5E01");
 
   u32 codelist_hook = is_mpn_handler_and_game_id_gp7e01 ?
                           Gecko::ENTRY_POINT_MP7 :
diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp
index b0bf57f4f2..7f1d76a4b8 100644
--- a/Source/Core/Core/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/HLE/HLE_Misc.cpp
@@ -33,7 +33,6 @@ const char* GetGeckoCodeHandlerPath()
   {
     case 0: return GECKO_CODE_HANDLER; // Dolphin (Stock)
     case 1: return GECKO_CODE_HANDLER_MPN; // MPN (Extended)
-    case 2: return GECKO_CODE_HANDLER_MPN_SUPER; // MPN (Super Extended)
     default: return GECKO_CODE_HANDLER; // Fallback
   }
 }
@@ -41,10 +40,10 @@ const char* GetGeckoCodeHandlerPath()
 bool IsGeckoCodeHandlerEnabled()
 {
   int code_handler_value = Config::Get(Config::MAIN_CODE_HANDLER); // Get the integer value
-  return code_handler_value == 1 || code_handler_value == 2; // Return true for 1 and 2
+  return code_handler_value == 1; // Return true for 1 and 2
 }
 
-bool IsGeckoCodeHandlerSUPER()
+bool IsGeckoCodeHandlerMPN()
 {
   int code_handler_value = Config::Get(Config::MAIN_CODE_HANDLER); // Get the integer value
   return code_handler_value == 2; // Return true for 1 and 2
@@ -72,11 +71,11 @@ void GeckoCodeHandlerICacheFlush(const Core::CPUThreadGuard& guard)
   // would be even uglier.)
 
   const bool is_mpn_handler_and_game_id_gp7e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP7E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP7E01");
   const bool is_mpn_handler_and_game_id_gp6e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP6E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP6E01");
   const bool is_mpn_handler_and_game_id_gp5e01 =
-      IsGeckoCodeHandlerSUPER() && (SConfig::GetInstance().GetGameID() == "GP5E01");
+      IsGeckoCodeHandlerMPN() && (SConfig::GetInstance().GetGameID() == "GP5E01");
 
   u32 codelist_hook = is_mpn_handler_and_game_id_gp7e01 ? Gecko::INSTALLER_BASE_ADDRESS_MP7 :
                       is_mpn_handler_and_game_id_gp6e01 ? Gecko::INSTALLER_BASE_ADDRESS_MP6 :
diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
index 54af1d08ba..307ff644e4 100644
--- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
@@ -225,8 +225,7 @@ void GeneralPane::CreateCheats()
   m_combobox_codehandler = new QComboBox();
   
   m_combobox_codehandler->addItem(tr("Dolphin (Stock)"), QVariant(0));
-  m_combobox_codehandler->addItem(tr("MPN (Extended)"), QVariant(1));
-  m_combobox_codehandler->addItem(tr("MPN (Super Extended)"), QVariant(2));
+  m_combobox_codehandler->addItem(tr("MPN (Super Extended)"), QVariant(1));
 
   code_handler_layout->addRow(code_handler_label, m_combobox_codehandler);
   cheats_group_layout->addLayout(code_handler_layout);
@@ -237,8 +236,7 @@ void GeneralPane::CreateCheats()
 
   // Add a label to define the different code handlers
   auto* code_handler_info_label = new QLabel(tr("<b>Dolphin (Stock)</b>: Compatibility with legacy and non Dolphin-MPN builds <br>(around 3,200 bytes / 400 lines of code.)<br><br>"
-    "<b>MPN (Extended)</b>: Improved code handler that has more space with some removed irrevalent functions<br>(around 3,200 bytes / 440 lines of code.)<br><br>"
-    "<b>MPN (Super Extended)</b>: Enhanced code handler that uses hacks to give certain games<br>currently Mario Party 4, 5, 6 and 8 way more code room<br>(around 30,000 bytes / 3,750 lines of codes)."));
+    "<b>MPN (Extended)</b>: Enhanced code handler that uses hacks to give certain games<br>currently Mario Party 4, 5, 6, 7, and 8 way more code room<br>(around 30,000 bytes / 3,750 lines of codes)."));
   
   code_handler_info_label->setWordWrap(true);
   cheats_group_layout->addWidget(code_handler_info_label);
@@ -385,4 +383,4 @@ void GeneralPane::OnCodeHandlerChanged(int index)
   int code_handler_value = m_combobox_codehandler->itemData(index).toInt();
   Config::SetBaseOrCurrent(Config::MAIN_CODE_HANDLER, code_handler_value);
   Config::Save();
-}
\ No newline at end of file
+}