diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
index a62b01c548..fbefcc7f65 100644
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -1817,11 +1817,6 @@ public interface Client extends GameShell
 	 * Get the item index of the item being dragged on an if1 widget
 	 */
 	int getIf1DraggedItemIndex();
-	
-	/**
-	 * If a widget is in target mode?
-	 */
-	boolean getSpellSelected();
 
 	/**
 	 * Sets if a widget is in target mode
diff --git a/runelite-client/src/main/java/net/runelite/client/input/MouseManager.java b/runelite-client/src/main/java/net/runelite/client/input/MouseManager.java
index d444f93fe6..ba1e3b80e8 100644
--- a/runelite-client/src/main/java/net/runelite/client/input/MouseManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/input/MouseManager.java
@@ -33,9 +33,6 @@ import javax.inject.Singleton;
 @Singleton
 public class MouseManager
 {
-	// Button numbers greater than BUTTON3 have no constant identifier
-	private static final int MOUSE_BUTTON_4 = 4;
-
 	private final List<MouseListener> mouseListeners = new CopyOnWriteArrayList<>();
 	private final List<MouseWheelListener> mouseWheelListeners = new CopyOnWriteArrayList<>();
 
@@ -77,7 +74,6 @@ public class MouseManager
 
 	public MouseEvent processMousePressed(MouseEvent mouseEvent)
 	{
-		checkExtraMouseButtons(mouseEvent);
 		for (MouseListener mouseListener : mouseListeners)
 		{
 			mouseEvent = mouseListener.mousePressed(mouseEvent);
@@ -87,7 +83,6 @@ public class MouseManager
 
 	public MouseEvent processMouseReleased(MouseEvent mouseEvent)
 	{
-		checkExtraMouseButtons(mouseEvent);
 		for (MouseListener mouseListener : mouseListeners)
 		{
 			mouseEvent = mouseListener.mouseReleased(mouseEvent);
@@ -97,7 +92,6 @@ public class MouseManager
 
 	public MouseEvent processMouseClicked(MouseEvent mouseEvent)
 	{
-		checkExtraMouseButtons(mouseEvent);
 		for (MouseListener mouseListener : mouseListeners)
 		{
 			mouseEvent = mouseListener.mouseClicked(mouseEvent);
@@ -105,17 +99,6 @@ public class MouseManager
 		return mouseEvent;
 	}
 
-	private void checkExtraMouseButtons(MouseEvent mouseEvent)
-	{
-		// Prevent extra mouse buttins from being passed into the client,
-		// as it treats them all as left click
-		int button = mouseEvent.getButton();
-		if (button >= MOUSE_BUTTON_4)
-		{
-			mouseEvent.consume();
-		}
-	}
-
 	public MouseEvent processMouseEntered(MouseEvent mouseEvent)
 	{
 		for (MouseListener mouseListener : mouseListeners)
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
index b4ee559e84..f49f938485 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
@@ -69,8 +69,4 @@ public abstract class Overlay implements LayoutableRenderableEntity
 	{
 		return this.getClass().getSimpleName();
 	}
-
-	public void onMouseOver()
-	{
-	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
index 09483f41df..10870f73b1 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
@@ -235,7 +235,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 			if (!isResizeable)
 			{
 				// On fixed mode, ABOVE_CHATBOX_RIGHT is in the same location as
-				// BOTTOM_RIGHT and CANVAS_TOP_RIGHT is same as TOP_RIGHT.
+				// BOTTOM_RIGHT and CANVAST_TOP_RIGHT is same as TOP_RIGHT.
 				// Just use BOTTOM_RIGHT and TOP_RIGHT to prevent overlays from
 				// drawing over each other.
 				switch (overlayPosition)
@@ -316,14 +316,9 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 						graphics.setColor(previous);
 					}
 
-					if (!client.isMenuOpen() && !client.getSpellSelected() && bounds.contains(mouse))
+					if (menuEntries == null && !client.isMenuOpen() && !client.isSpellSelected() && bounds.contains(mouse))
 					{
-						if (menuEntries == null)
-						{
-							menuEntries = createRightClickMenuEntries(overlay);
-						}
-
-						overlay.onMouseOver();
+						menuEntries = createRightClickMenuEntries(overlay);
 					}
 				}
 			}
@@ -639,4 +634,4 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 
 		return entries;
 	}
-}
\ No newline at end of file
+}