diff --git a/src/osdep/gui/PanelDisplay.cpp b/src/osdep/gui/PanelDisplay.cpp
index fb897405..8e763ed1 100644
--- a/src/osdep/gui/PanelDisplay.cpp
+++ b/src/osdep/gui/PanelDisplay.cpp
@@ -13,17 +13,6 @@
 #include "gui.h"
 #include "gui_handling.h"
 
-
-const int amigawidth_values[] = {320, 352, 384, 640, 704, 768};
-const int amigaheight_values[] = {200, 216, 240, 256, 262, 270};
-
-static gcn::Window* grpAmigaScreen;
-static gcn::Label* lblAmigaWidth;
-static gcn::Label* lblAmigaWidthInfo;
-static gcn::Slider* sldAmigaWidth;
-static gcn::Label* lblAmigaHeight;
-static gcn::Label* lblAmigaHeightInfo;
-static gcn::Slider* sldAmigaHeight;
 static gcn::UaeCheckBox* chkFrameskip;
 static gcn::Window* grpScalingMethod;
 static gcn::UaeRadioButton* optAuto;
@@ -35,23 +24,7 @@ class AmigaScreenActionListener : public gcn::ActionListener
 public:
 	void action(const gcn::ActionEvent& actionEvent) override
 	{
-		if (actionEvent.getSource() == sldAmigaWidth)
-		{
-			if (changed_prefs.gfx_size.width != amigawidth_values[int(sldAmigaWidth->getValue())])
-			{
-				changed_prefs.gfx_size.width = amigawidth_values[int(sldAmigaWidth->getValue())];
-				RefreshPanelDisplay();
-			}
-		}
-		else if (actionEvent.getSource() == sldAmigaHeight)
-		{
-			if (changed_prefs.gfx_size.height != amigaheight_values[int(sldAmigaHeight->getValue())])
-			{
-				changed_prefs.gfx_size.height = amigaheight_values[int(sldAmigaHeight->getValue())];
-				RefreshPanelDisplay();
-			}
-		}
-		else if (actionEvent.getSource() == chkFrameskip)
+		if (actionEvent.getSource() == chkFrameskip)
 		{
 			changed_prefs.gfx_framerate = chkFrameskip->isSelected() ? 1 : 0;
 		}
@@ -80,49 +53,7 @@ void InitPanelDisplay(const struct _ConfigCategory& category)
 {
 	amigaScreenActionListener = new AmigaScreenActionListener();
 
-	lblAmigaWidth = new gcn::Label("Width:");
-	lblAmigaWidth->setSize(150, LABEL_HEIGHT);
-	lblAmigaWidth->setAlignment(gcn::Graphics::RIGHT);
-	sldAmigaWidth = new gcn::Slider(0, 5);
-	sldAmigaWidth->setSize(160, SLIDER_HEIGHT);
-	sldAmigaWidth->setBaseColor(gui_baseCol);
-	sldAmigaWidth->setMarkerLength(20);
-	sldAmigaWidth->setStepLength(1);
-	sldAmigaWidth->setId("sldWidth");
-	sldAmigaWidth->addActionListener(amigaScreenActionListener);
-	lblAmigaWidthInfo = new gcn::Label("320");
-
-	lblAmigaHeight = new gcn::Label("Height:");
-	lblAmigaHeight->setSize(150, LABEL_HEIGHT);
-	lblAmigaHeight->setAlignment(gcn::Graphics::RIGHT);
-	sldAmigaHeight = new gcn::Slider(0, 5);
-	sldAmigaHeight->setSize(160, SLIDER_HEIGHT);
-	sldAmigaHeight->setBaseColor(gui_baseCol);
-	sldAmigaHeight->setMarkerLength(20);
-	sldAmigaHeight->setStepLength(1);
-	sldAmigaHeight->setId("sldHeight");
-	sldAmigaHeight->addActionListener(amigaScreenActionListener);
-	lblAmigaHeightInfo = new gcn::Label("200");
-
-	grpAmigaScreen = new gcn::Window("Amiga Screen");
-	grpAmigaScreen->setPosition(DISTANCE_BORDER, DISTANCE_BORDER);
-
 	int posY = DISTANCE_BORDER;
-	grpAmigaScreen->add(lblAmigaWidth, 0, posY);
-	grpAmigaScreen->add(sldAmigaWidth, 20, posY);
-	grpAmigaScreen->add(lblAmigaWidthInfo, 20 + sldAmigaWidth->getWidth() + 12, posY);
-	posY += sldAmigaWidth->getHeight() + DISTANCE_NEXT_Y;
-	grpAmigaScreen->add(lblAmigaHeight, 0, posY);
-	grpAmigaScreen->add(sldAmigaHeight, 20, posY);
-	grpAmigaScreen->add(lblAmigaHeightInfo, 20 + sldAmigaHeight->getWidth() + 12, posY);
-	posY += DISTANCE_BORDER + sldAmigaHeight->getHeight() + DISTANCE_NEXT_Y;
-
-	grpAmigaScreen->setMovable(false);
-	grpAmigaScreen->setSize(240, posY);
-	grpAmigaScreen->setBaseColor(gui_baseCol);
-
-	category.panel->add(grpAmigaScreen);
-	posY += DISTANCE_BORDER + DISTANCE_NEXT_Y;
 
 	chkFrameskip = new gcn::UaeCheckBox("Frameskip");
 	chkFrameskip->addActionListener(amigaScreenActionListener);
@@ -131,7 +62,7 @@ void InitPanelDisplay(const struct _ConfigCategory& category)
 	posY += DISTANCE_BORDER + chkFrameskip->getHeight() + DISTANCE_NEXT_Y;
 
 	scalingMethodActionListener = new ScalingMethodActionListener();
-	
+
 	optAuto = new gcn::UaeRadioButton("Auto", "radioscalingmethodgroup");
 	optAuto->addActionListener(scalingMethodActionListener);
 
@@ -158,13 +89,6 @@ void InitPanelDisplay(const struct _ConfigCategory& category)
 
 void ExitPanelDisplay()
 {
-	delete lblAmigaWidth;
-	delete sldAmigaWidth;
-	delete lblAmigaWidthInfo;
-	delete lblAmigaHeight;
-	delete sldAmigaHeight;
-	delete lblAmigaHeightInfo;
-	delete grpAmigaScreen;
 	delete chkFrameskip;
 	delete amigaScreenActionListener;
 
@@ -178,31 +102,6 @@ void ExitPanelDisplay()
 
 void RefreshPanelDisplay()
 {
-	int i;
-	char tmp[32];
-
-	for (i = 0; i < 6; ++i)
-	{
-		if (changed_prefs.gfx_size.width == amigawidth_values[i])
-		{
-			sldAmigaWidth->setValue(i);
-			snprintf(tmp, 32, "%d", changed_prefs.gfx_size.width);
-			lblAmigaWidthInfo->setCaption(tmp);
-			break;
-		}
-	}
-
-	for (i = 0; i < 6; ++i)
-	{
-		if (changed_prefs.gfx_size.height == amigaheight_values[i])
-		{
-			sldAmigaHeight->setValue(i);
-			snprintf(tmp, 32, "%d", changed_prefs.gfx_size.height);
-			lblAmigaHeightInfo->setCaption(tmp);
-			break;
-		}
-	}
-
 	chkFrameskip->setSelected(changed_prefs.gfx_framerate);
 
 	if (changed_prefs.scaling_method == -1)
diff --git a/src/osdep/menu/menu_config.cpp b/src/osdep/menu/menu_config.cpp
index 1b40aa40..f83b8beb 100644
--- a/src/osdep/menu/menu_config.cpp
+++ b/src/osdep/menu/menu_config.cpp
@@ -20,299 +20,11 @@ extern map<int, int> customControlMap;
 
 static int kickstart;
 
-static int presetModeId = 2;
-
-
-static void SetPresetMode(int mode, struct uae_prefs* p)
-{
-	presetModeId = mode;
-
-	switch (mode)
-	{
-	case 0:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 768;
-		break;
-
-	case 1:
-		p->gfx_size.height = 216;
-		p->gfx_size_fs.width = 716;
-		break;
-
-	case 2:
-		p->gfx_size.height = 240;
-		p->gfx_size_fs.width = 640;
-		break;
-
-	case 3:
-		p->gfx_size.height = 256;
-		p->gfx_size_fs.width = 600;
-		break;
-
-	case 4:
-		p->gfx_size.height = 262;
-		p->gfx_size_fs.width = 588;
-		break;
-
-	case 5:
-		p->gfx_size.height = 270;
-		p->gfx_size_fs.width = 570;
-		break;
-
-	case 6:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 640;
-		break;
-
-	case 7:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 10:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 768;
-		break;
-
-	case 11:
-		p->gfx_size.height = 216;
-		p->gfx_size_fs.width = 716;
-		break;
-
-	case 12:
-		p->gfx_size.height = 240;
-		p->gfx_size_fs.width = 640;
-		break;
-
-	case 13:
-		p->gfx_size.height = 256;
-		p->gfx_size_fs.width = 600;
-		break;
-
-	case 14:
-		p->gfx_size.height = 262;
-		p->gfx_size_fs.width = 588;
-		break;
-
-	case 15:
-		p->gfx_size.height = 270;
-		p->gfx_size_fs.width = 570;
-		break;
-
-	case 16:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 640;
-		break;
-
-	case 17:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 20:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 21:
-		p->gfx_size.height = 216;
-		p->gfx_size_fs.width = 784;
-		break;
-
-	case 22:
-		p->gfx_size.height = 240;
-		p->gfx_size_fs.width = 704;
-		break;
-
-	case 23:
-		p->gfx_size.height = 256;
-		p->gfx_size_fs.width = 660;
-		break;
-
-	case 24:
-		p->gfx_size.height = 262;
-		p->gfx_size_fs.width = 640;
-		break;
-
-	case 25:
-		p->gfx_size.height = 270;
-		p->gfx_size_fs.width = 624;
-		break;
-
-	case 26:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 704;
-		break;
-
-	case 27:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 30:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 31:
-		p->gfx_size.height = 216;
-		p->gfx_size_fs.width = 784;
-		break;
-
-	case 32:
-		p->gfx_size.height = 240;
-		p->gfx_size_fs.width = 704;
-		break;
-
-	case 33:
-		p->gfx_size.height = 256;
-		p->gfx_size_fs.width = 660;
-		break;
-
-	case 34:
-		p->gfx_size.height = 262;
-		p->gfx_size_fs.width = 640;
-		break;
-
-	case 35:
-		p->gfx_size.height = 270;
-		p->gfx_size_fs.width = 624;
-		break;
-
-	case 36:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 704;
-		break;
-
-	case 37:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 40:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 41:
-		p->gfx_size.height = 216;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 42:
-		p->gfx_size.height = 240;
-		p->gfx_size_fs.width = 768;
-		break;
-
-	case 43:
-		p->gfx_size.height = 256;
-		p->gfx_size_fs.width = 720;
-		break;
-
-	case 44:
-		p->gfx_size.height = 262;
-		p->gfx_size_fs.width = 704;
-		break;
-
-	case 45:
-		p->gfx_size.height = 270;
-		p->gfx_size_fs.width = 684;
-		break;
-
-	case 46:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 47:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 50:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 51:
-		p->gfx_size.height = 216;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 52:
-		p->gfx_size.height = 240;
-		p->gfx_size_fs.width = 768;
-		break;
-
-	case 53:
-		p->gfx_size.height = 256;
-		p->gfx_size_fs.width = 720;
-		break;
-
-	case 54:
-		p->gfx_size.height = 262;
-		p->gfx_size_fs.width = 704;
-		break;
-
-	case 55:
-		p->gfx_size.height = 270;
-		p->gfx_size_fs.width = 684;
-		break;
-
-	case 56:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	case 57:
-		p->gfx_size.height = 200;
-		p->gfx_size_fs.width = 800;
-		break;
-
-	default:
-		p->gfx_size.height = 240;
-		p->gfx_size_fs.width = 640;
-		presetModeId = 2;
-		break;
-	}
-
-	switch (presetModeId / 10)
-	{
-	case 0:
-		p->gfx_size.width = 320;
-		break;
-
-	case 1:
-		p->gfx_size.width = 640;
-		break;
-
-	case 2:
-		p->gfx_size.width = 352;
-		break;
-
-	case 3:
-		p->gfx_size.width = 704;
-		break;
-
-	case 4:
-		p->gfx_size.width = 384;
-		break;
-
-	case 5:
-		p->gfx_size.width = 768;
-		break;
-	}
-}
-
-
 static void SetDefaultMenuSettings(struct uae_prefs* p)
 {
 	kickstart = 1;
-
-	SetPresetMode(2, p);
 }
 
-
 static void replace(char* str, char replace, char toreplace)
 {
 	while (*str)
@@ -322,7 +34,6 @@ static void replace(char* str, char replace, char toreplace)
 	}
 }
 
-
 int create_configfilename(char* dest, char* basename, int fromDir)
 {
 	char* p;
@@ -354,7 +65,6 @@ int create_configfilename(char* dest, char* basename, int fromDir)
 	return 0;
 }
 
-
 const char* kickstarts_rom_names[] = {"kick12.rom\0", "kick13.rom\0", "kick20.rom\0", "kick31.rom\0", "aros-amiga-m68k-rom.bin\0"};
 const char* extended_rom_names[] = {"\0", "\0", "\0", "\0", "aros-amiga-m68k-ext.bin\0"};
 const char* kickstarts_names[] = {"KS ROM v1.2\0", "KS ROM v1.3\0", "KS ROM v2.05\0", "KS ROM v3.1\0", "\0"};
@@ -471,7 +181,6 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
 		p->chipset_refreshrate = 60;
 	else
 		p->chipset_refreshrate = 50;
-	fscanf(f, "presetModeId=%d\n", &presetModeId);
 	fscanf(f, "displayedLines=%d\n", &p->gfx_size.height);
 	fscanf(f, "screenWidth=%d\n", &p->gfx_size_fs.width);
 	fscanf(f, "cutLeft=%d\n", &dummy);
@@ -530,7 +239,7 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
 	if (p->m68k_speed == 2)
 		p->m68k_speed = M68K_SPEED_25MHZ_CYCLES;
 	p->cachesize = 0;
-	p->cpu_compatible = 0;
+	p->cpu_compatible = false;
 	switch (cpu_level)
 	{
 	case 0:
@@ -561,7 +270,7 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
 	disk_eject(3);
 	fscanf(f, "df0=%s\n", &filebuffer);
 	replace(filebuffer, ' ', '|');
-	if (DISK_validate_filename(p, filebuffer, 0, NULL, NULL, NULL))
+	if (DISK_validate_filename(p, filebuffer, 0, nullptr, nullptr, nullptr))
 		strcpy(p->floppyslots[0].df, filebuffer);
 	else
 		p->floppyslots[0].df[0] = 0;
@@ -571,7 +280,7 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
 		memset(filebuffer, 0, 256);
 		fscanf(f, "df1=%s\n", &filebuffer);
 		replace(filebuffer, ' ', '|');
-		if (DISK_validate_filename(p, filebuffer, 0, NULL, NULL, NULL))
+		if (DISK_validate_filename(p, filebuffer, 0, nullptr, nullptr, nullptr))
 			strcpy(p->floppyslots[1].df, filebuffer);
 		else
 			p->floppyslots[1].df[0] = 0;
@@ -582,7 +291,7 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
 		memset(filebuffer, 0, 256);
 		fscanf(f, "df2=%s\n", &filebuffer);
 		replace(filebuffer, ' ', '|');
-		if (DISK_validate_filename(p, filebuffer, 0, NULL, NULL, NULL))
+		if (DISK_validate_filename(p, filebuffer, 0, nullptr, nullptr, nullptr))
 			strcpy(p->floppyslots[2].df, filebuffer);
 		else
 			p->floppyslots[2].df[0] = 0;
@@ -593,7 +302,7 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
 		memset(filebuffer, 0, 256);
 		fscanf(f, "df3=%s\n", &filebuffer);
 		replace(filebuffer, ' ', '|');
-		if (DISK_validate_filename(p, filebuffer, 0, NULL, NULL, NULL))
+		if (DISK_validate_filename(p, filebuffer, 0, nullptr, nullptr, nullptr))
 			strcpy(p->floppyslots[3].df, filebuffer);
 		else
 			p->floppyslots[3].df[0] = 0;
@@ -625,8 +334,6 @@ int loadconfig_old(struct uae_prefs* p, const char* orgpath)
 
 	fclose(f);
 
-	SetPresetMode(presetModeId, p);
-
 	CheckKickstart(p);
 
 	return 1;