diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs
index 5a58dedea1..00f27089c4 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs	
@@ -38,7 +38,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
 		{
 			bool ret = PCESyncSettings.NeedsReboot(o, _syncSettings);
 			_syncSettings = o;
-			// SetControllerButtons(); // not safe to change the controller during emulation, so instead make it a reboot event
 			return ret;
 		}
 
@@ -95,25 +94,11 @@ namespace BizHawk.Emulation.Cores.PCEngine
 			[TypeConverter(typeof(DescribableEnumConverter))]
 			public PceControllerType Port5 { get; set; } = PceControllerType.Unplugged;
 
-			public ControllerSetting[] Controllers =
-			{
-				new ControllerSetting { IsConnected = true },
-				new ControllerSetting { IsConnected = false },
-				new ControllerSetting { IsConnected = false },
-				new ControllerSetting { IsConnected = false },
-				new ControllerSetting { IsConnected = false }
-			};
-
 			public PCESyncSettings Clone()
 			{
 				return (PCESyncSettings)MemberwiseClone();
 			}
 
-			public class ControllerSetting
-			{
-				public bool IsConnected { get; set; }
-			}
-
 			public static bool NeedsReboot(PCESyncSettings x, PCESyncSettings y)
 			{
 				return x.Port1 != y.Port1
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs
index 52b5c7e444..b22c525347 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs	
@@ -1,46 +1,7 @@
-using BizHawk.Emulation.Common;
-
-namespace BizHawk.Emulation.Cores.PCEngine
+namespace BizHawk.Emulation.Cores.PCEngine
 {
 	public partial class PCEngine
 	{
-		private readonly ControllerDefinition PCEngineController = new ControllerDefinition
-		{
-			Name = "PC Engine Controller",
-			BoolButtons =
-			{
-				"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Run", "P1 B2", "P1 B1",
-				"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Run", "P2 B2", "P2 B1",
-				"P3 Up", "P3 Down", "P3 Left", "P3 Right", "P3 Select", "P3 Run", "P3 B2", "P3 B1",
-				"P4 Up", "P4 Down", "P4 Left", "P4 Right", "P4 Select", "P4 Run", "P4 B2", "P4 B1",
-				"P5 Up", "P5 Down", "P5 Left", "P5 Right", "P5 Select", "P5 Run", "P5 B2", "P5 B1"
-			}
-		};
-
-		private void SetControllerButtons()
-		{
-			ControllerDefinition.BoolButtons.Clear();
-			ControllerDefinition.FloatControls.Clear();
-
-			for (int i = 0; i < 5; i++)
-			{
-				if (_syncSettings.Controllers[i].IsConnected)
-				{
-					ControllerDefinition.BoolButtons.AddRange(new[]
-					{
-						"P" + (i + 1) + " Up",
-						"P" + (i + 1) + " Down",
-						"P" + (i + 1) + " Left",
-						"P" + (i + 1) + " Right",
-						"P" + (i + 1) + " Select",
-						"P" + (i + 1) + " Run",
-						"P" + (i + 1) + " B1",
-						"P" + (i + 1) + " B2"
-					});
-				}
-			}
-		}
-
 		private int SelectedController;
 		private byte InputByte;
 
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
index d3d43f1464..3eda6208b5 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
@@ -48,7 +48,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
 				_syncSettings.Port3,
 				_syncSettings.Port4,
 				_syncSettings.Port5);
-			//SetControllerButtons(); // TODO: get rid of this method
 		}
 
 		public PCEngine(CoreComm comm, GameInfo game, Disc disc, object Settings, object syncSettings)
@@ -110,7 +109,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
 				_syncSettings.Port3,
 				_syncSettings.Port4,
 				_syncSettings.Port5);
-			//SetControllerButtons();
 		}
 
 		// ROM