diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp
index e0c28e4c..df61993d 100644
--- a/src/drivers/win/debugger.cpp
+++ b/src/drivers/win/debugger.cpp
@@ -1379,7 +1379,6 @@ BOOL CALLBACK DebuggerEnumWindowsProc(HWND hwnd, LPARAM lParam)
 		case IDC_DEBUGGER_BP_ADD:
 		case IDC_DEBUGGER_BP_DEL:
 		case IDC_DEBUGGER_BP_EDIT:
-		case IDC_DEBUGGER_BREAK_ON_BAD_OP:
 		case IDC_DEBUGGER_STATUSFLAGS:
 		case IDC_DEBUGGER_FLAG_N:
 		case IDC_DEBUGGER_FLAG_V:
@@ -1418,20 +1417,6 @@ BOOL CALLBACK DebuggerEnumWindowsProc(HWND hwnd, LPARAM lParam)
 			crect.left += dx;
 			SetWindowPos(hwnd, 0, crect.left, crect.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
 			break;
-		case IDC_DEBUGGER_VAL_S3:
-		case IDC_DEBUGGER_ROM_OFFSETS:
-		case IDC_DEBUGGER_ENABLE_SYMBOLIC:
-		case IDC_DEBUGGER_PREDEFINED_REGS:
-		case IDC_DEBUGGER_RELOAD_SYMS:
-		case IDC_DEBUGGER_ROM_PATCHER:
-		case DEBUGAUTOLOAD:
-		case DEBUGLOADDEB:
-		case DEBUGIDAFONT:
-			// no stretch, move up and down full length, move left and right full length
-			crect.top += dy_r;
-			crect.left += dx;
-			SetWindowPos(hwnd, 0, crect.left, crect.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-			break;
 		case IDC_DEBUGGER_ADDR_LINE:
 			// horizontal stretch, move up and down full length 
 			crect.top += dy_l;
@@ -1621,7 +1606,6 @@ BOOL CALLBACK IDC_DEBUGGER_DISASSEMBLY_WndProc(HWND hwndDlg, UINT uMsg, WPARAM w
 					if (!symbDebugEnabled)
 					{
 						symbDebugEnabled = true;
-						CheckDlgButton(hDebug, IDC_DEBUGGER_ENABLE_SYMBOLIC, BST_CHECKED);
 					}
 					UpdateDebugger(false);
 				} else
@@ -1778,15 +1762,6 @@ void DebuggerInitDialog(HWND hwndDlg)
 	sprintf(str, "%u", (unsigned)break_instructions_limit);
 	SetDlgItemText(hwndDlg, IDC_DEBUGGER_INSTRUCTIONS_EXCEED, str);
 
-	CheckDlgButton(hwndDlg, IDC_DEBUGGER_BREAK_ON_BAD_OP, FCEUI_Debugger().badopbreak ? BST_CHECKED : BST_UNCHECKED);
-
-	CheckDlgButton(hwndDlg, DEBUGLOADDEB, debuggerSaveLoadDEBFiles ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwndDlg, DEBUGIDAFONT, debuggerIDAFont ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwndDlg, DEBUGAUTOLOAD, debuggerAutoload ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwndDlg, IDC_DEBUGGER_ROM_OFFSETS, debuggerDisplayROMoffsets ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwndDlg, IDC_DEBUGGER_ENABLE_SYMBOLIC, symbDebugEnabled ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwndDlg, IDC_DEBUGGER_PREDEFINED_REGS, symbRegNames ? BST_CHECKED : BST_UNCHECKED);
-
 	if (DbgPosX==-32000) DbgPosX=0; //Just in case
 	if (DbgPosY==-32000) DbgPosY=0;
 	SetWindowPos(hwndDlg,0,DbgPosX,DbgPosY,0,0,SWP_NOSIZE|SWP_NOZORDER|SWP_NOOWNERZORDER);
@@ -1976,19 +1951,6 @@ void DebuggerBnClicked(HWND hwndDlg, uint16 btnId, HWND hwndBtn)
 	// Buttons that don't need a rom loaded to do something, such as autoload
 	switch (btnId)
 	{
-		case DEBUGAUTOLOAD: // TODO: delete/merge with ID_DEBUGGER_AUTO_OPEN
-			debuggerAutoload ^= 1;
-			break;
-		case DEBUGLOADDEB: // TODO: delete/merge with ID_DEBUGGER_LOAD_DEB_FILE
-			debuggerSaveLoadDEBFiles = !debuggerSaveLoadDEBFiles;
-			break;
-		case DEBUGIDAFONT: // TODO: delete/merge with ID_DEBUGGER_IDA_FONT
-			debuggerIDAFont ^= 1;
-			debugSystem->hDisasmFont = debuggerIDAFont ? debugSystem->hIDAFont : debugSystem->hFixedFont;
-			debugSystem->disasmFontHeight = debuggerIDAFont ? IDAFontSize : debugSystem->fixedFontHeight;
-			SendDlgItemMessage(hwndDlg, IDC_DEBUGGER_DISASSEMBLY, WM_SETFONT, (WPARAM)debugSystem->hDisasmFont, FALSE);
-			UpdateDebugger(false);
-			break;
 		case ID_DEBUGGER_DEFCOLOR:
 		{
 			if (!IsDebugColorDefault() && MessageBox(hwndDlg, "Do you want to restore all the colors to default?", "Restore default colors", MB_YESNO | MB_ICONINFORMATION) == IDYES)
@@ -2028,7 +1990,6 @@ void DebuggerBnClicked(HWND hwndDlg, uint16 btnId, HWND hwndBtn)
 		}
 		break;
 		// Options menu
-		// TODO: Reuse/merge with the old IDs from the persistent buttons.
 		case ID_DEBUGGER_AUTO_OPEN:
 			debuggerAutoload ^= 1;
 			break;
@@ -2222,10 +2183,6 @@ void DebuggerBnClicked(HWND hwndDlg, uint16 btnId, HWND hwndBtn)
 				}
 				break;
 			}
-			// TODO: delete/merge with ID_DEBUGGER_BREAK_BAD_OPCODES
-			case IDC_DEBUGGER_BREAK_ON_BAD_OP: //Break on bad opcode
-				FCEUI_Debugger().badopbreak ^= 1;
-				break;
 			case IDC_DEBUGGER_FLAG_N: X.P^=N_FLAG; UpdateDebugger(false); break;
 			case IDC_DEBUGGER_FLAG_V: X.P^=V_FLAG; UpdateDebugger(false); break;
 			case IDC_DEBUGGER_FLAG_U: X.P^=U_FLAG; UpdateDebugger(false); break;
@@ -2253,42 +2210,9 @@ void DebuggerBnClicked(HWND hwndDlg, uint16 btnId, HWND hwndBtn)
 				CheckDlgButton(hwndDlg, IDC_DEBUGGER_BREAK_ON_INSTRUCTIONS, break_on_instructions);
 				break;
 			}
-			case IDC_DEBUGGER_RELOAD_SYMS:
-			{ // TODO: delete/merge with ID_DEBUGGER_RELOAD_SYMBOLS
-				ramBankNamesLoaded = false;
-				for(int i=0;i<ARRAYSIZE(pageNumbersLoaded);i++)
-					pageNumbersLoaded[i] = -1;
-				loadNameFiles();
-				UpdateDebugger(false);
-				break;
-			}
 			case IDC_DEBUGGER_BOOKMARK_ADD: AddDebuggerBookmark(hwndDlg); break;
 			case IDC_DEBUGGER_BOOKMARK_DEL: DeleteDebuggerBookmark(hwndDlg); break;
 			case IDC_DEBUGGER_BOOKMARK_EDIT: EditDebuggerBookmark(hwndDlg); break;
-			case IDC_DEBUGGER_ENABLE_SYMBOLIC:
-			{ // TODO: delete/merge with ID_DEBUGGER_SYMBOLIC_DEBUG
-				symbDebugEnabled ^= 1;
-				CheckDlgButton(hwndDlg, IDC_DEBUGGER_ENABLE_SYMBOLIC, symbDebugEnabled ? BST_CHECKED : BST_UNCHECKED);
-				UpdateDebugger(false);
-				break;
-			}
-			case IDC_DEBUGGER_PREDEFINED_REGS:
-			{ // TODO: delete/merge with ID_DEBUGGER_DEFAULT_REG_NAMES
-				symbRegNames ^= 1;
-				CheckDlgButton(hwndDlg, IDC_DEBUGGER_PREDEFINED_REGS, symbRegNames ? BST_CHECKED : BST_UNCHECKED);
-				UpdateDebugger(false);
-				break;
-			}
-							
-// ################################## End of SP CODE ###########################
-							
-			case IDC_DEBUGGER_ROM_OFFSETS:
-			{ // TODO: delete/merge with ID_DEBUGGER_SHOW_ROM_OFFSETS
-				debuggerDisplayROMoffsets ^= 1;
-				UpdateDebugger(false);
-				break;
-			}
-			case IDC_DEBUGGER_ROM_PATCHER: DoPatcher(-1,hwndDlg); break; // TODO: delete/merge with ID_DEBUGGER_ROM_PATCHER
 			// Double click the breakpoint list
 			case DEBUGGER_CONTEXT_TOGGLEBREAK: DebuggerLbnDblClk(hwndDlg, IDC_DEBUGGER_BP_LIST, hwndBtn); break;
 		}
diff --git a/src/drivers/win/memview.cpp b/src/drivers/win/memview.cpp
index 0eb55579..54c3cdc4 100644
--- a/src/drivers/win/memview.cpp
+++ b/src/drivers/win/memview.cpp
@@ -2054,8 +2054,6 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
 					if (!symbDebugEnabled)
 					{
 						symbDebugEnabled = true;
-						if (hDebug)
-							CheckDlgButton(hDebug, IDC_DEBUGGER_ENABLE_SYMBOLIC, BST_CHECKED);
 					}
 					UpdateCaption();
 				}
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 44289b61..472aa16d 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -792,24 +792,22 @@ BEGIN
     EDITTEXT        IDC_DEBUGGER_VAL_X,387,90,15,12,ES_UPPERCASE | ES_WANTRETURN
     LTEXT           "Y:",IDC_DEBUGGER_TEXT_Y,406,92,9,8
     EDITTEXT        IDC_DEBUGGER_VAL_Y,415,90,15,12,ES_UPPERCASE | ES_WANTRETURN
-    GROUPBOX        "Breakpoints",IDC_DEBUGGER_BREAKPOINTS,434,2,116,138,WS_TABSTOP
+    GROUPBOX        "Breakpoints",IDC_DEBUGGER_BREAKPOINTS,434,2,116,126,WS_TABSTOP
     LISTBOX         IDC_DEBUGGER_BP_LIST,438,11,107,96,LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL
     PUSHBUTTON      "Add",IDC_DEBUGGER_BP_ADD,438,109,31,15
     PUSHBUTTON      "Delete",IDC_DEBUGGER_BP_DEL,476,109,31,15,WS_DISABLED
     PUSHBUTTON      "Edit",IDC_DEBUGGER_BP_EDIT,515,109,31,15,WS_DISABLED
-    CONTROL         "Break on Bad Opcodes",IDC_DEBUGGER_BREAK_ON_BAD_OP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,440,126,94,10
     GROUPBOX        "Stack",IDC_DEBUGGER_VAL_S,349,104,81,71,WS_TABSTOP
     EDITTEXT        IDC_DEBUGGER_STACK_CONTENTS,353,113,73,58,ES_MULTILINE | ES_UPPERCASE | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL
-    GROUPBOX        "Status Flags",IDC_DEBUGGER_STATUSFLAGS,434,140,116,35,WS_TABSTOP
-    CONTROL         "N",IDC_DEBUGGER_FLAG_N,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,440,149,18,12
-    CONTROL         "V",IDC_DEBUGGER_FLAG_V,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,471,149,18,12
-    CONTROL         "U",IDC_DEBUGGER_FLAG_U,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,500,149,18,12
-    CONTROL         "B",IDC_DEBUGGER_FLAG_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,528,149,18,12
-    CONTROL         "D",IDC_DEBUGGER_FLAG_D,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,440,161,18,12
-    CONTROL         "I",IDC_DEBUGGER_FLAG_I,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,471,161,18,12
-    CONTROL         "Z",IDC_DEBUGGER_FLAG_Z,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,500,161,18,12
-    CONTROL         "C",IDC_DEBUGGER_FLAG_C,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,528,161,18,12
+    GROUPBOX        "Status Flags",IDC_DEBUGGER_STATUSFLAGS,434,128,116,35,WS_TABSTOP
+    CONTROL         "N",IDC_DEBUGGER_FLAG_N,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,440,137,18,12
+    CONTROL         "V",IDC_DEBUGGER_FLAG_V,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,471,137,18,12
+    CONTROL         "U",IDC_DEBUGGER_FLAG_U,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,500,137,18,12
+    CONTROL         "B",IDC_DEBUGGER_FLAG_B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,528,137,18,12
+    CONTROL         "D",IDC_DEBUGGER_FLAG_D,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,440,149,18,12
+    CONTROL         "I",IDC_DEBUGGER_FLAG_I,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,471,149,18,12
+    CONTROL         "Z",IDC_DEBUGGER_FLAG_Z,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,500,149,18,12
+    CONTROL         "C",IDC_DEBUGGER_FLAG_C,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,528,149,18,12
     GROUPBOX        "",IDC_DEBUGGER_VAL_S2,349,174,55,53,WS_TABSTOP
     LTEXT           "PPU:",IDC_DEBUGGER_TEXT_PPU,352,180,16,8
     EDITTEXT        IDC_DEBUGGER_VAL_PPU,371,180,28,12,ES_UPPERCASE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER,WS_EX_TRANSPARENT
@@ -837,17 +835,8 @@ BEGIN
     PUSHBUTTON      "Delete",IDC_DEBUGGER_BOOKMARK_DEL,436,273,30,14
     PUSHBUTTON      "Edit",IDC_DEBUGGER_BOOKMARK_EDIT,436,290,30,14
     PUSHBUTTON      "Reset counters",IDC_DEBUGGER_RESET_COUNTERS,479,229,68,14
-    GROUPBOX        "",IDC_DEBUGGER_VAL_S3,474,241,77,75
-    CONTROL         "ROM offsets",IDC_DEBUGGER_ROM_OFFSETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,479,249,62,10
-    CONTROL         "Symbolic debug",IDC_DEBUGGER_ENABLE_SYMBOLIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,479,261,62,10
-    CONTROL         "Register names",IDC_DEBUGGER_PREDEFINED_REGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,479,272,65,10
-    PUSHBUTTON      "Reload Symbols",IDC_DEBUGGER_RELOAD_SYMS,480,283,64,14
-    PUSHBUTTON      "Rom Patcher",IDC_DEBUGGER_ROM_PATCHER,480,299,64,14
     CONTROL         "",IDC_DEBUGGER_ADDR_LINE,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,4,319,341,11
     EDITTEXT        IDC_DEBUGGER_DISASSEMBLY_LEFT_PANEL,4,5,14,312,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED
-    CONTROL         "Auto open on ROM load",DEBUGAUTOLOAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,361,319,90,10
-    CONTROL         "Load .DEB file",DEBUGLOADDEB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,455,319,58,10
-    CONTROL         "IDA font",DEBUGIDAFONT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,514,319,42,10
 END
 
 TRACER DIALOGEX 0, 0, 317, 181
diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index 99a63bcd..ec1fbaa8 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -122,7 +122,6 @@
 #define COMBO_FAM                       110
 #define IDB_TE_ARROW                    110
 #define IDC_CHECK_LOG_REGISTERS         110
-#define IDC_DEBUGGER_BREAK_ON_BAD_OP    110
 #define IDC_ROMPATCHER_BTN_APPLY        110
 #define LBL_CDLOGGER_RENDERCOUNT        110
 #define IDC_VIDEOCONFIG_SQUARE_PIXELS   110
@@ -131,7 +130,6 @@
 #define CB_DISABLE_SCREEN_SAVER         111
 #define BTN_FAM                         111
 #define IDC_CHECK_LOG_PROCESSOR_STATUS  111
-#define IDC_DEBUGGER_RELOAD_SYMS        111
 #define IDC_ROMPATCHER_BTN_SAVE         111
 #define IDC_CHEAT_COM                   111
 #define IDC_VIDEOCONFIG_DIRECTDRAW_FS   111
@@ -277,11 +275,9 @@
 #define BUTTON_MOVIE                    206
 #define IDC_DEBUGGER_FLAG_C             207
 #define BUTTON_MEMWATCH                 207
-#define IDC_DEBUGGER_ENABLE_SYMBOLIC    208
 #define IDB_TE_GREEN_BLUE_ARROW         208
 #define BUTTON_BOT                      208
 #define IDB_PIANO_0                     209
-#define IDC_DEBUGGER_ROM_OFFSETS        209
 #define BUTTON_MACRO                    209
 #define IDB_PIANO_1                     210
 #define BUTTON_PRESET                   210
@@ -463,7 +459,6 @@
 #define IDC_DEBUGGER_VAL_INSTRUCTIONS_COUNT 506
 #define IDC_DEBUGGER_VAL_INSTRUCTIONS_COUNT2 507
 #define IDC_VIDEOCONFIG_NO8LIM          600
-#define IDC_DEBUGGER_ROM_PATCHER        602
 #define LIST_DEBUGGER_BOOKMARKS         701
 #define BTN_CANCEL                      800
 #define IDC_GAME_GENIE_CODE             1000
@@ -603,7 +598,6 @@
 #define MW_VAL15                        1047
 #define IDC_DEBUGGER_TEXT_INSTRUCTIONS_COUNT 1047
 #define MW_NAME16                       1048
-#define IDC_DEBUGGER_VAL_S3             1048
 #define MW_ADDR16                       1049
 #define IDC_MAPPER_TEXT                 1049
 #define IDC_DEBUGGER_TEXT_A             1049
@@ -772,7 +766,6 @@
 #define IDC_MOVIE_SUGGEST_READONLY      1201
 #define ID_SOUND_QUALITYNOTIFY          1202
 #define CB_ENABLECONTEXTMENU            1203
-#define DEBUGAUTOLOAD                   1203
 #define IDC_CHEAT_PAUSEWHENACTIVE       1203
 #define IDC_FULLSAVESTATES              1203
 #define IDC_SUPERIMPOSE                 1203
@@ -792,7 +785,6 @@
 #define IDC_COPY_MARKERS                1204
 #define IDC_AUTOSAVECDL                 1204
 #define IDC_INVERT_THE_MASK             1204
-#define IDC_DEBUGGER_PREDEFINED_REGS    1204
 #define IDC_RAMLIST                     1205
 #define IDC_CHECK_BOOKMARKS             1205
 #define IDC_RUN_AUTO                    1205
@@ -855,7 +847,6 @@
 #define IDC_LUACONSOLE_CHOOSEFONT       1255
 #define IDC_EDIT_LUAARGS                1256
 #define CB_PARTIALVISUALTHEME           1257
-#define DEBUGLOADDEB                    1258
 #define IDC_C_SEARCHROM                 1258
 #define IDC_SINGLEINSTANCE              1258
 #define IDC_MOVIE_CLOSEAFTERPLAYBACK    1258
@@ -899,7 +890,6 @@
 #define STATIC_CONTRASTVALUE            1300
 #define CTL_PALBRIGHT_TRACKBAR          1301
 #define STATIC_BRIGHTVALUE              1302
-#define DEBUGIDAFONT                    1305
 #define IDC_AUTOSAVE_PERIOD_EVERY_TEXT  1306
 #define IDC_AUTOSAVE_PERIOD_MINUTES_TEXT 1307
 #define IDC_VBLANK_SCANLINES_TEXT       1308