diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
index e8371eaa2d..7659251583 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
@@ -194,7 +194,7 @@ namespace BizHawk.Client.Common
 		{
 			foreach (var nlf in _luaFunctions.Where(nlf => nlf.Guid.ToString() == guid.ToString()))
 			{
-				_luaFunctions.RemoveFunction(nlf);
+				_luaFunctions.Remove(nlf);
 				return true;
 			}
 
@@ -205,7 +205,7 @@ namespace BizHawk.Client.Common
 		{
 			foreach (var nlf in _luaFunctions.Where(nlf => nlf.Name == name.ToString()))
 			{
-				_luaFunctions.RemoveFunction(nlf);
+				_luaFunctions.Remove(nlf);
 				return true;
 			}
 
diff --git a/BizHawk.Client.Common/lua/LuaFunctionList.cs b/BizHawk.Client.Common/lua/LuaFunctionList.cs
index 91cdffd026..6f3796f204 100644
--- a/BizHawk.Client.Common/lua/LuaFunctionList.cs
+++ b/BizHawk.Client.Common/lua/LuaFunctionList.cs
@@ -13,11 +13,11 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public void RemoveFunction(NamedLuaFunction function)
+		public new bool Remove(NamedLuaFunction function)
 		{
 			Global.Emulator.CoreComm.InputCallback.Remove(function.Callback);
 			Global.Emulator.CoreComm.MemoryCallbackSystem.Remove(function.Callback);
-			Remove(function);
+			return base.Remove(function);
 		}
 
 		public void ClearAll()
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index bf4715619b..02b57b4fc2 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -703,7 +703,6 @@ namespace BizHawk.Client.EmuHawk
 					}
 
 					item.Stop();
-					
 				}
 			}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
index 946ff98184..ae9a459df5 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
@@ -87,7 +87,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					var guid = FunctionView.Items[index].SubItems[2].Text;
 					var nlf = GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions[guid];
-					GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions.RemoveFunction(nlf);
+					GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions.Remove(nlf);
 				}
 				PopulateListView();
 			}