diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs
index 8df64a4e6c..4a14b76b5e 100644
--- a/BizHawk.MultiClient/Global.cs
+++ b/BizHawk.MultiClient/Global.cs
@@ -25,57 +25,10 @@ namespace BizHawk.MultiClient
 		public static CoreComm CoreComm;
 		public static GameInfo Game;
 		public static CheatList CheatList;
-
+		
 		public static Controller NullControls;
 		public static AutofireController AutofireNullControls;
 
-		public static Controller NESControls;
-		public static AutofireController AutofireNESControls;
-
-		public static Controller SNESControls;
-		public static AutofireController AutofireSNESControls;
-
-		public static Controller GBControls;
-		public static AutofireController AutofireGBControls;
-
-		public static Controller DualGBControls;
-		public static AutofireController DualAutofireGBControls;
-
-		public static Controller GBAControls;
-		public static AutofireController AutofireGBAControls;
-
-		public static Controller PCEControls;
-		public static AutofireController AutofirePCEControls;
-
-		public static Controller SMSControls;
-		public static AutofireController AutofireSMSControls;
-
-		public static Controller GenControls;
-		public static AutofireController AutofireGenControls;
-
-		public static Controller TI83Controls;
-
-		public static Controller Atari2600Controls;
-		public static AutofireController AutofireAtari2600Controls;
-
-		public static Controller Atari7800Controls;
-		public static AutofireController AutofireAtari7800Controls;
-
-		public static Controller ColecoControls;
-		public static AutofireController AutofireColecoControls;
-
-		public static Controller SaturnControls;
-		public static AutofireController AutofireSaturnControls;
-
-		public static Controller IntellivisionControls;
-		public static AutofireController AutofireIntellivisionControls;
-
-		public static Controller Commodore64Controls;
-		public static AutofireController AutofireCommodore64Controls;
-
-		public static Controller N64Controls;
-		public static AutofireController AutofireN64Controls;
-
 		public static readonly Dictionary<string, Dictionary<string, string>> BUTTONS = new Dictionary<string, Dictionary<string, string>>
 		{
 			{
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 45fdafeb71..2e11b01a03 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1117,6 +1117,7 @@ namespace BizHawk.MultiClient
 			Global.AutoFireController = BindToDefinitionAF(def, Global.Config.AllTrollersAutoFire);
 
 			// allow propogating controls that are in the current controller definition but not in the prebaked one
+			// these two lines shouldn't be required anymore under the new system?
 			Global.ActiveController.ForceType(new ControllerDefinition(Global.Emulator.ControllerDefinition));
 			Global.ClickyVirtualPadController.Type = new ControllerDefinition(Global.Emulator.ControllerDefinition);			
 			RewireInputChain();