diff --git a/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs b/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
index 7e7b3a80c6..790a2d76f1 100644
--- a/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
+++ b/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
@@ -62,12 +62,6 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public void Unset(string button)
-		{
-			_buttonHolds.Remove(button);
-			_axisHolds.Remove(button);
-		}
-
 		public bool IsSticky(string button) => _buttonHolds.Contains(button);
 
 		public void ClearStickies()
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
index e5f3fc4dee..9805450ad2 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
@@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Clear()
 		{
-			_stickyXorAdapter.Unset(Name);
+			_stickyXorAdapter.SetAxis(Name, null);
 			IsSet = false;
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
index 89b5876b73..7ee0b792fa 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
@@ -138,8 +138,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			AnalogStick.Clear(fromCallback: true);
 			SetNumericsFromAnalog();
-			_stickyXorAdapter.Unset(AnalogStick.XName);
-			_stickyXorAdapter.Unset(AnalogStick.YName);
+			_stickyXorAdapter.SetAxis(AnalogStick.XName, null);
+			_stickyXorAdapter.SetAxis(AnalogStick.YName, null);
 		}
 
 		public void Clear() => AnalogStick.Clear();
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
index a53a01f6e5..b6371d204e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
@@ -58,8 +58,8 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Clear()
 		{
-			_stickyXorAdapter.Unset(XName);
-			_stickyXorAdapter.Unset(YName);
+			_stickyXorAdapter.SetAxis(XName, null);
+			_stickyXorAdapter.SetAxis(YName, null);
 			_overrideX = null;
 			_overrideY = null;
 			_isSet = false;