diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp
index a5256996f..64f27ec27 100644
--- a/src/gui/WndMain.cpp
+++ b/src/gui/WndMain.cpp
@@ -634,19 +634,6 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
 			}
 			break;
 
-			case ID_FILE_SAVEXBEFILE:
-			{
-				if (m_XbeFilename[0] == '\0')
-					SaveXbeAs();
-				else
-					SaveXbe(m_XbeFilename);
-			}
-			break;
-
-			case ID_FILE_SAVEXBEFILEAS:
-				SaveXbeAs();
-				break;
-
 			case ID_FILE_RXBE_0:
 			case ID_FILE_RXBE_1:
 			case ID_FILE_RXBE_2:
@@ -884,41 +871,6 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
 			}
 			break;
 
-			case ID_EDIT_PATCH_DEBUGMODE:
-			{
-				m_bXbeChanged = true;
-
-				// patch to/from debug mode
-				if ((m_Xbe->m_Header.dwEntryAddr ^ XOR_EP_RETAIL) > 0x01000000)
-				{
-					// we're in debug mode, so switch over to retail
-					uint32_t ep = m_Xbe->m_Header.dwEntryAddr ^ XOR_EP_RETAIL;            // decode from debug mode
-					uint32_t kt = m_Xbe->m_Header.dwKernelImageThunkAddr ^ XOR_KT_DEBUG;  // decode from debug mode
-
-					m_Xbe->m_Header.dwEntryAddr = ep ^ XOR_EP_DEBUG;                    // encode to retail mode
-					m_Xbe->m_Header.dwKernelImageThunkAddr = kt ^ XOR_KT_RETAIL;        // encode to retail mode
-				}
-				else
-				{
-					// we're in retail mode, so switch to debug
-					uint32_t ep = m_Xbe->m_Header.dwEntryAddr ^ XOR_EP_DEBUG;             // decode from retail mode
-					uint32_t kt = m_Xbe->m_Header.dwKernelImageThunkAddr ^ XOR_KT_RETAIL; // decode from retail mode
-
-					m_Xbe->m_Header.dwEntryAddr = ep ^ XOR_EP_RETAIL;                   // encode to debug mode
-					m_Xbe->m_Header.dwKernelImageThunkAddr = kt ^ XOR_KT_DEBUG;         // encode to debug mode
-				}
-
-				RefreshMenus();
-
-				bool res = (m_Xbe->m_Header.dwEntryAddr ^ XOR_EP_RETAIL) > 0x01000000;
-
-				if (res)
-					printf("WndMain: %s was converted to debug mode.\n", m_Xbe->m_szAsciiTitle);
-				else
-					printf("WndMain: %s was converted to retail mode.\n", m_Xbe->m_szAsciiTitle);
-			}
-			break;
-
 			case ID_EDIT_DUMPXBEINFOTO_FILE:
 			{
 				OPENFILENAME ofn = { 0 };
@@ -1663,15 +1615,9 @@ void WndMain::RefreshMenus()
             // enable/disable close .xbe file
             EnableMenuItem(file_menu, ID_FILE_CLOSE_XBE, MF_BYCOMMAND | MF_WhenXbeLoaded);
 
-            // enable/disable save .xbe file
-            EnableMenuItem(file_menu, ID_FILE_SAVEXBEFILE, MF_BYCOMMAND | MF_WhenXbeLoaded);
-
-            // enable/disable save .xbe file as
-            EnableMenuItem(file_menu, ID_FILE_SAVEXBEFILEAS, MF_BYCOMMAND | MF_WhenXbeLoaded);
-
             // recent xbe files menu
             {
-                HMENU rxbe_menu = GetSubMenu(file_menu, 7);
+                HMENU rxbe_menu = GetSubMenu(file_menu, 4);
 
                 int max = m_dwRecentXbe;
                 for(int v=0;v<max;v++)
@@ -1683,7 +1629,6 @@ void WndMain::RefreshMenus()
         {
             HMENU edit_menu = GetSubMenu(menu, 1);
             HMENU logo_menu = GetSubMenu(edit_menu, 0);
-            HMENU pach_menu = GetSubMenu(edit_menu, 1);
 
             // enable export .xbe info
             EnableMenuItem(edit_menu, ID_EDIT_DUMPXBEINFOTO_FILE, MF_BYCOMMAND | MF_WhenXbeLoaded);
@@ -1694,17 +1639,6 @@ void WndMain::RefreshMenus()
 
             // enable patch menu
             EnableMenuItem(edit_menu, 1, MF_BYPOSITION | MF_WhenXbeLoaded);
-
-            // patch menu
-            {
-                // check "debug mode" if appropriate
-                if(m_Xbe != nullptr)
-                {
-                    UINT chk_flag = ((m_Xbe->m_Header.dwEntryAddr ^ XOR_EP_RETAIL) > 0x01000000) ? MF_CHECKED : MF_UNCHECKED;
-
-                    CheckMenuItem(pach_menu, ID_EDIT_PATCH_DEBUGMODE, chk_flag);
-                }
-            }
         }
 
         // view menu
@@ -1895,7 +1829,7 @@ void WndMain::UpdateDebugConsoles()
 void WndMain::UpdateRecentFiles()
 {
     HMENU FileMenu = GetSubMenu(GetMenu(m_hwnd), 0);
-    HMENU RXbeMenu = GetSubMenu(FileMenu, 7);
+    HMENU RXbeMenu = GetSubMenu(FileMenu, 4);
 
     // clear existing menu items
     {
@@ -2183,7 +2117,7 @@ void WndMain::OpenMRU(int mru)
 {
 	HMENU menu = GetMenu(m_hwnd);
 	HMENU file_menu = GetSubMenu(menu, 0);
-	HMENU rxbe_menu = GetSubMenu(file_menu, 7);
+	HMENU rxbe_menu = GetSubMenu(file_menu, 4);
 
 	char szBuffer[270];
 
diff --git a/src/gui/resource/Cxbx.rc b/src/gui/resource/Cxbx.rc
index 96808300f..303bfa66d 100644
--- a/src/gui/resource/Cxbx.rc
+++ b/src/gui/resource/Cxbx.rc
@@ -621,9 +621,6 @@ BEGIN
         MENUITEM "Open D&ashboard...\tF7",      ID_FILE_OPEN_DASHBOARD,MFT_STRING,MFS_ENABLED
         MENUITEM "&Close Xbe",                  ID_FILE_CLOSE_XBE,MFT_STRING,MFS_ENABLED
         MENUITEM "", -1, MFT_SEPARATOR
-        MENUITEM "&Save Xbe",                   ID_FILE_SAVEXBEFILE,MFT_STRING,MFS_ENABLED
-        MENUITEM "Save Xbe &As...",             ID_FILE_SAVEXBEFILEAS,MFT_STRING,MFS_ENABLED
-        MENUITEM "", -1, MFT_SEPARATOR
         POPUP "&Recent Xbe Files",              65535,MFT_STRING,MFS_ENABLED
         BEGIN
             MENUITEM "&0 : Recent Placeholder",     ID_FILE_RXBE_0,MFT_STRING,MFS_ENABLED
@@ -647,10 +644,6 @@ BEGIN
             MENUITEM "&Import...",                  ID_EDIT_LOGOBITMAP_IMPORT,MFT_STRING,MFS_ENABLED
             MENUITEM "&Export...",                  ID_EDIT_LOGOBITMAP_EXPORT,MFT_STRING,MFS_ENABLED
         END
-        POPUP "&Patch",                         65535,MFT_STRING,MFS_ENABLED
-        BEGIN
-            MENUITEM "&Debug Mode",                 ID_EDIT_PATCH_DEBUGMODE,MFT_STRING,MFS_ENABLED
-        END
         MENUITEM "", -1, MFT_SEPARATOR
         POPUP "Dump &Xbe Info To...",           65535,MFT_STRING,MFS_ENABLED
         BEGIN
diff --git a/src/gui/resource/ResCxbx.h b/src/gui/resource/ResCxbx.h
index 53263fb9c..28edb0a0b 100644
--- a/src/gui/resource/ResCxbx.h
+++ b/src/gui/resource/ResCxbx.h
@@ -272,11 +272,8 @@
 #define ID_FILE_CLOSE_XBE               40014
 #define ID_FILE_OPEN_DASHBOARD          40015
 #define ID_HELP_HOMEPAGE                40019
-#define ID_FILE_SAVEXBEFILE             40021
-#define ID_FILE_SAVEXBEFILEAS           40022
 #define ID_EDIT_LOGOBITMAP_EXPORT       40025
 #define ID_EDIT_LOGOBITMAP_IMPORT       40026
-#define ID_EDIT_PATCH_DEBUGMODE         40031
 #define ID_EMULATION_DEBUGOUTPUTGUI_CONSOLE 40035
 #define ID_EMULATION_DEBUGOUTPUTGUI_FILE 40036
 #define ID_EMULATION_DEBUGOUTPUTKERNEL_CONSOLE 40037