diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index f05536b5a0c..d7e889a789b 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -220,18 +220,6 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
 
 	addVolumeControls(tab, "GameOptions_Volume.");
 
-	//
-	// 6) The MIDI tab
-	//
-	tab->addTab("MIDI");
-
-	_globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", "Override global MIDI settings", kCmdGlobalMIDIOverride, 0);
-
-	if (_guioptions & Common::GUIO_NOMIDI)
-		_globalMIDIOverride->setEnabled(false);
-
-	addMIDIControls(tab, "GameOptions_MIDI.");
-
 	//
 	// 2) The 'Path' tab
 	//
@@ -297,13 +285,6 @@ void EditGameDialog::open() {
 		ConfMan.hasKey("speech_volume", _domain);
 	_globalVolumeOverride->setState(e);
 
-	e = ConfMan.hasKey("soundfont", _domain) ||
-		ConfMan.hasKey("multi_midi", _domain) ||
-		ConfMan.hasKey("native_mt32", _domain) ||
-		ConfMan.hasKey("enable_gs", _domain) ||
-		ConfMan.hasKey("midi_gain", _domain);
-	_globalMIDIOverride->setState(e);
-
 	// TODO: game path
 
 	const Common::LanguageDescription *l = Common::g_languages;
diff --git a/gui/options.cpp b/gui/options.cpp
index 07b97251733..614dd5183d3 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -506,13 +506,6 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 	new ButtonWidget(tab, "GlobalOptions_Misc.ThemeButton", "Theme:", kChooseThemeCmd, 0);
 	_curTheme = new StaticTextWidget(tab, "GlobalOptions_Misc.CurTheme", g_gui.theme()->getThemeName());
 
-
-	_rendererPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.RendererPopupDesc", "GUI Renderer:");
-	_rendererPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.RendererPopup");
-
-	for (uint i = 1; i < GUI::ThemeEngine::_rendererModesSize; ++i)
-		_rendererPopUp->appendEntry(GUI::ThemeEngine::_rendererModes[i].name, GUI::ThemeEngine::_rendererModes[i].mode);
-
 	_autosavePeriodPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.AutosavePeriodPopupDesc", "Autosave:");
 	_autosavePeriodPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.AutosavePeriodPopup");
 
@@ -619,15 +612,6 @@ void GlobalOptionsDialog::close() {
 #endif
 
 		ConfMan.setInt("autosave_period", _autosavePeriodPopUp->getSelectedTag(), _domain);
-
-		GUI::ThemeEngine::GraphicsMode selected = (GUI::ThemeEngine::GraphicsMode)_rendererPopUp->getSelectedTag();
-		const char *cfg = GUI::ThemeEngine::findModeConfigName(selected);
-		if (!ConfMan.get("gui_renderer").equalsIgnoreCase(cfg)) {
-			// FIXME: Actually, any changes (including the theme change) should
-			// only become active *after* the options dialog has closed.
-			g_gui.loadNewTheme(g_gui.theme()->getThemeId(), selected);
-			ConfMan.set("gui_renderer", cfg, _domain);
-		}
 	}
 	OptionsDialog::close();
 }