diff --git a/Source/Client/Stove/StoveMgr.cpp b/Source/Client/Stove/StoveMgr.cpp
index af6dad16..492e01c2 100644
--- a/Source/Client/Stove/StoveMgr.cpp
+++ b/Source/Client/Stove/StoveMgr.cpp
@@ -10,7 +10,6 @@
 #include "UI/UIBroadcastBalloon.h"
 #include "UI/Window/UIWindow.h"
 #include "UI/Window/UIWindowMgr.h"
-#include "UI/Window/WindowMouseHit.h"
 #include "Utility/Cipher/XorBytes.h"
 #include "Utility/Text/FormatString.h"
 
@@ -204,7 +203,7 @@ void ShutdownCallback::operator()(Stove::PCSDK::CallbackResult callbackResult, S
       const char* caption = captionName.Text();
       MessageBoxA(hWnd, message.c_str(), caption, MB_OK);
       g_modeMgr.gameMode->SendMsg(2, 0, 0, 0, 0);
-    } else if (g_alternateDoubleClickGate == 0) {
+    } else if (g_modeMgr.state == 0) {
       g_windowMgr.Confirm(message.c_str(), 0, true, true, 0, "Message", 280, 120, 0);
     } else {
       UIBroadcastBalloon* balloonWindow = static_cast<CGameMode*>(g_modeMgr.GetGameMode())->EnsureBroadcastBalloon();
diff --git a/Source/UI/Window/UINewSkillListWnd.cpp b/Source/UI/Window/UINewSkillListWnd.cpp
index 5430a78a..3c363607 100644
--- a/Source/UI/Window/UINewSkillListWnd.cpp
+++ b/Source/UI/Window/UINewSkillListWnd.cpp
@@ -21,7 +21,6 @@
 #include "UI/Window/UIResizer.h"
 #include "UI/Lists/UIScrollBar.h"
 #include "UI/Lists/UITabControl.h"
-#include "UI/Window/WindowMouseHit.h"
 #include "UI/Chat/UINewChatWnd.h"
 #include "UI/Window/InputFocus.h"
 #include "UI/Skill/UISkillDescribeWnd.h"
@@ -1029,7 +1028,7 @@ void UINewSkillListWnd::Slot31(int x, int y) {
 // OFFSET: 0x009B28F0
 // FUNCTION: fn_13819
 void UINewSkillListWnd::Slot28(int x, int y) {
-  const int gate = g_mouseRefreshGate;
+  const int gate = g_session.m_simplifiedSkillList;
   if (!this->IsSkillArea(x, y) || (gate != 0 && x > 96)) {
     return;
   }
diff --git a/Source/UI/Window/UINewSkillListWndHitTest.cpp b/Source/UI/Window/UINewSkillListWndHitTest.cpp
index bb21bd57..46c9cbe6 100644
--- a/Source/UI/Window/UINewSkillListWndHitTest.cpp
+++ b/Source/UI/Window/UINewSkillListWndHitTest.cpp
@@ -1,5 +1,5 @@
+#include "Client/Session.h"
 #include "UI/Window/UINewSkillListWnd.h"
-#include "UI/Window/WindowMouseHit.h"
 
 // OFFSET: 0x009B0240
 // FUNCTION: fn_13804
@@ -10,7 +10,7 @@ int UINewSkillListWnd::SkillIndexAt(int x, int y) {
 
   int column = 0;
   int row;
-  if (g_mouseRefreshGate != 0) {
+  if (g_session.m_simplifiedSkillList != 0) {
     row = (y - 34) / 32;
   } else {
     column = (x - 76) / 68;
diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp
index 8c9098cc..f1474b52 100644
--- a/Source/UI/Window/WindowMgrState.cpp
+++ b/Source/UI/Window/WindowMgrState.cpp
@@ -28,7 +28,6 @@
 #include "UI/Window/UIRoulletteWnd.h"
 #include "UI/Window/UIWindow.h"
 #include "UI/Window/UIWindowMgr.h"
-#include "UI/Window/WindowMouseHit.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
diff --git a/Source/UI/Window/WindowMouseHit.cpp b/Source/UI/Window/WindowMouseHit.cpp
index fdd2199c..83e60dc0 100644
--- a/Source/UI/Window/WindowMouseHit.cpp
+++ b/Source/UI/Window/WindowMouseHit.cpp
@@ -1,3 +1,5 @@
+#include "Client/Session.h"
+#include "Client/Mode/ModeMgr.h"
 #include "Client/Browser/WebBrowser.h"
 #include "Client/Input/Mouse.h"
 #include "Client/Replay.h"
@@ -11,12 +13,6 @@
 #include "UI/Window/UIWindowMgr.h"
 #include "UI/Layout/WindowCoordinates.h"
 #include "UI/Window/WindowManagerWindows.h"
-#include "UI/Window/WindowMouseHit.h"
-
-// GLOBAL: gl_24656
-int g_alternateDoubleClickGate;
-// GLOBAL: gl_24657
-int g_mouseRefreshGate;
 
 // INLINED
 static void PromoteWindow(UIWindowMgr& mgr, UIWindow* window) {
@@ -197,7 +193,7 @@ int UIWindowMgr::ProcessMouse() {
       this->inputWindow->Slot25(localX, localY);
     }
 
-    if (g_mouse.buttons[0] == 4 && (g_replayAnimationScaling == 0 || g_alternateDoubleClickGate == 0)) {
+    if (g_mouse.buttons[0] == 4 && (g_replayAnimationScaling == 0 || g_modeMgr.state == 0)) {
       this->inputWindow->Slot25(localX, localY);
       this->inputWindow->Slot26(localX, localY);
     }
@@ -238,7 +234,7 @@ int UIWindowMgr::ProcessMouse() {
       const int localX = x - left;
       const int localY = y - top;
 
-      if (g_mouse.buttons[0] == 4 && (g_replayAnimationScaling == 0 || g_alternateDoubleClickGate == 0)) {
+      if (g_mouse.buttons[0] == 4 && (g_replayAnimationScaling == 0 || g_modeMgr.state == 0)) {
         window->Slot26(localX, localY);
       }
 
@@ -321,7 +317,7 @@ int UIWindowMgr::ProcessMouse() {
     if (this->window_03D8) {
       this->window_03D8->Invalidate();
     }
-    if (this->window_02C4 && g_mouseRefreshGate == 0) {
+    if (this->window_02C4 && g_session.m_simplifiedSkillList == 0) {
       this->window_02C4->Invalidate();
     }
     if (this->window_4F170) {
diff --git a/Source/UI/Window/WindowMouseHit.h b/Source/UI/Window/WindowMouseHit.h
deleted file mode 100644
index 1c4654ee..00000000
--- a/Source/UI/Window/WindowMouseHit.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef RAGNAROK_SOURCE_UI_WINDOW_WINDOWMOUSEHIT_H
-#define RAGNAROK_SOURCE_UI_WINDOW_WINDOWMOUSEHIT_H
-
-#include <array>
-#include <cstdint>
-#include <deque>
-#include <list>
-#include <map>
-
-class UIWindow;
-#include "UI/Window/WindowManagerWindows.h"
-
-extern int g_alternateDoubleClickGate;
-extern int g_mouseRefreshGate;
-
-#endif