diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 6f4cfcf188..1024696bb6 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1149,7 +1149,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void TraceLoggerMenuItem_Click(object sender, EventArgs e)
 		{
-			GlobalWin.Tools.LoadTraceLogger();
+			GlobalWin.Tools.Load<TraceLogger>();
 		}
 
 		private void DebuggerMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index 7b29585201..0cc0af47ad 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -300,7 +300,7 @@ namespace BizHawk.Client.EmuHawk
 					GlobalWin.Tools.Load<HexEditor>();
 					break;
 				case "Trace Logger":
-					GlobalWin.Tools.LoadTraceLogger();
+					GlobalWin.Tools.Load<TraceLogger>();
 					break;
 				case "Lua Console":
 					OpenLuaConsole();
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index b9bc6071c5..762b6e028b 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -449,7 +449,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (Global.Config.TraceLoggerAutoLoad)
 			{
-				GlobalWin.Tools.LoadTraceLogger();
+				GlobalWin.Tools.Load<TraceLogger>();
 			}
 
 			if (Global.Config.GenericDebuggerAutoload)
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
index 5daa423bb8..629f00f058 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
@@ -211,7 +211,7 @@ namespace BizHawk.Client.EmuHawk
 		)]
 		public static void OpenTraceLogger()
 		{
-			GlobalWin.Tools.LoadTraceLogger();
+			GlobalWin.Tools.Load<TraceLogger>();
 		}
 
 		[LuaMethodAttributes(
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 7dfbfe7868..60809a972a 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -557,14 +557,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public void LoadTraceLogger()
-		{
-			if (Global.Emulator.CpuTraceAvailable())
-			{
-				Load<TraceLogger>();
-			}
-		}
-
 		public void LoadGameGenieEc()
 		{
 			if (Global.Emulator.SystemId == "NES")