From 19095bb7e541646dbc241f032e6a6aecc9127f4e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 18 Apr 2020 09:55:53 -0500
Subject: [PATCH] simplify

---
 BizHawk.Client.Common/movie/MovieSession.cs |  7 -------
 BizHawk.Client.EmuHawk/MainForm.Designer.cs |  4 ++--
 BizHawk.Client.EmuHawk/MainForm.Events.cs   | 12 ------------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 1951b284f1..2a4e30444e 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -3,14 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores;
-using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
 using BizHawk.Emulation.Cores.Nintendo.Gameboy;
-using BizHawk.Emulation.Cores.Nintendo.NES;
-using BizHawk.Emulation.Cores.Nintendo.SNES9X;
-using BizHawk.Emulation.Cores.Nintendo.SNES;
-using BizHawk.Emulation.Cores.Nintendo.GBA;
-using BizHawk.Emulation.Cores.Nintendo.GBHawk;
 
 namespace BizHawk.Client.Common
 {
diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index b28218c7c0..00ee41b379 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -2239,14 +2239,14 @@
 			this.quickNESMenuItem.Name = "quickNESMenuItem";
 			this.quickNESMenuItem.Size = new System.Drawing.Size(118, 22);
 			this.quickNESMenuItem.Text = "&QuickNes";
-			this.quickNESMenuItem.Click += new System.EventHandler(this.QuickNesMenuItem_Click);
+			this.quickNESMenuItem.Click += new System.EventHandler(this.QuickNesCorePick_Click);
 			// 
 			// nesHawkToolStripMenuItem
 			// 
 			this.nesHawkMenuItem.Name = "nesHawkMenuItem";
 			this.nesHawkMenuItem.Size = new System.Drawing.Size(118, 22);
 			this.nesHawkMenuItem.Text = "&NesHawk";
-			this.nesHawkMenuItem.Click += new System.EventHandler(this.NesHawkMenuItem_Click);
+			this.nesHawkMenuItem.Click += new System.EventHandler(this.NesCorePick_Click);
 			// 
 			// toolStripSeparator34
 			// 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index ddce19eb76..63b658fad5 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1557,18 +1557,6 @@ namespace BizHawk.Client.EmuHawk
 
 		#region NES
 
-		private void QuickNesMenuItem_Click(object sender, EventArgs e)
-		{
-			Config.PreferredCores["NES"] = CoreNames.QuickNes;
-			FlagNeedsReboot();
-		}
-
-		private void NesHawkMenuItem_Click(object sender, EventArgs e)
-		{
-			Config.PreferredCores["NES"] = CoreNames.NesHawk;
-			FlagNeedsReboot();
-		}
-
 		private void NesSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
 			var boardName = Emulator.HasBoardInfo() ? Emulator.AsBoardInfo().BoardName : null;