diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
index ebf3ce5a..8e29dcc3 100644
--- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
+++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
@@ -216,8 +216,8 @@ UIChooseSellBuyWnd::UIChooseSellBuyWnd(UIWindowContext& windows, UIAcceptanceCon
 
 // OFFSET: 0x008C6FA0
 // FUNCTION: fn_11926
-UIBookWnd::UIBookWnd(UIWindowContext& windows, UIBookContext& book)
-    : UIFrameWnd(windows, 0), m_book(&book) {
+UIBookWnd::UIBookWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
   this->m_lineCount = 0;
   this->m_pageCount = 0;
   this->m_page = 1;
@@ -3500,7 +3500,7 @@ int UIBookWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intp
       }
     }
     this->Invalidate();
-    this->m_book->ordering.Promote(this);
+    reinterpret_cast<WindowOrdering&>(g_windowMgr).Promote(this);
     break;
   }
 
diff --git a/Source/UI/Dialogs/UIBookWnd.h b/Source/UI/Dialogs/UIBookWnd.h
index e94ace05..43b2e850 100644
--- a/Source/UI/Dialogs/UIBookWnd.h
+++ b/Source/UI/Dialogs/UIBookWnd.h
@@ -9,16 +9,10 @@
 
 class UISpriteButton;
 class UITextViewer;
-struct WindowOrdering;
-
-struct UIBookContext {
-  void* unknown_text;
-  WindowOrdering& ordering;
-};
 
 class UIBookWnd : public UIFrameWnd {
 public:
-  UIBookWnd(UIWindowContext& windows, UIBookContext& book);
+  UIBookWnd(UIWindowContext& windows);
   /* 00B4 */ UITextViewer* m_viewer;
   /* 00B8 */ UIWindow* unknown_00B8;
   /* 00BC */ char m_bookName[100];
@@ -42,9 +36,6 @@ public:
 
   int LoadBookmark(const char* name);
   char* StripColorCodes(const char* text);
-
-protected:
-  UIBookContext* m_book;
 };
 
 extern const char* g_bookmarkKeySuffix;
diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.cpp b/Source/UI/Party/UIRequestJoinPartyWnd.cpp
index f7354a2f..e27dbec2 100644
--- a/Source/UI/Party/UIRequestJoinPartyWnd.cpp
+++ b/Source/UI/Party/UIRequestJoinPartyWnd.cpp
@@ -24,8 +24,8 @@ namespace {
 
 // OFFSET: 0x007BB030
 // FUNCTION: fn_09280
-UIRequestJoinPartyWnd::UIRequestJoinPartyWnd(UIWindowContext& windows, UIRequestJoinPartyContext& request)
-    : UIFrameWnd(windows, 0), m_request(&request) {
+UIRequestJoinPartyWnd::UIRequestJoinPartyWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
 }
 
 // OFFSET: 0x007BB960
@@ -160,11 +160,11 @@ int UIRequestJoinPartyWnd::SendMsg(UIWindow* sender, int message, std::intptr_t
     }
 
     if (value == 542 && this->block->geometry.unknown_0030 != 0) {
-      this->m_request->requests.Block(this->accountId);
+      g_requestJoinPartyMgr->Block(this->accountId);
     }
 
     static_cast<CMode*>(g_charViewMode)->SendMsg(264, this->characterId, value == 541, reinterpret_cast<std::intptr_t>(&this->accountId), 0);
-    this->m_request->requests.Advance();
+    g_requestJoinPartyMgr->Advance();
     this->block->SetChecked(0);
 
     return 0;
diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.h b/Source/UI/Party/UIRequestJoinPartyWnd.h
index 3a8c4d8c..73389444 100644
--- a/Source/UI/Party/UIRequestJoinPartyWnd.h
+++ b/Source/UI/Party/UIRequestJoinPartyWnd.h
@@ -10,16 +10,11 @@ class UICheckBox;
 class UIStaticText;
 class UIBitmapButton;
 struct PartyJoinRequest;
-class UIRequestJoinPartyMgr;
 
-struct UIRequestJoinPartyContext {
-  void* unknown_text;
-  UIRequestJoinPartyMgr& requests;
-};
 
 class UIRequestJoinPartyWnd : public UIFrameWnd {
 public:
-  UIRequestJoinPartyWnd(UIWindowContext& windows, UIRequestJoinPartyContext& request);
+  UIRequestJoinPartyWnd(UIWindowContext& windows);
   ~UIRequestJoinPartyWnd() override;
   void Slot15(int width, int height) override;
   void Paint() override;
@@ -40,13 +35,10 @@ public:
   /* 00E2 */ std::int16_t level;
   /* 00E4 */ UIBitmapButton* icon;
   /* 00E8 */ UIStaticText* levelText;
-
-private:
-  UIRequestJoinPartyContext* m_request;
 };
 
 #if defined(_WIN32) && !defined(_WIN64)
-static_assert(sizeof(UIRequestJoinPartyWnd) == 248);
+static_assert(sizeof(UIRequestJoinPartyWnd) == 244);
 #endif
 
 #endif