diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp
index 4d4745a3..c9301503 100644
--- a/Source/Contents/CashEmotionMgr.cpp
+++ b/Source/Contents/CashEmotionMgr.cpp
@@ -278,7 +278,7 @@ static_assert(sizeof(CashEmotionPurchasePacket) == 7);
 
 class UICashEmotionListWnd : public UIFrameWnd {
 public:
-  UICashEmotionListWnd(UIWindowContext& windows, UIEditContext& edits);
+  UICashEmotionListWnd(UIWindowContext& windows);
   void Slot11() override;
   void Slot15(int width, int height) override;
   void Slot19() override;
@@ -313,7 +313,6 @@ protected:
   /* 00E8 */ UICashEmotionListChildWnd_Abstract* m_currentList;
   /* 00EC */ UIStaticText* m_period;
   void* unknown_controls;
-  UIEditContext* m_edits;
 };
 
 class UICashEmotionMiniWnd : public UIWindow {
@@ -2160,10 +2159,10 @@ int UICashEmotionListChildWnd_UnPurchased::SendMsg(UIWindow* sender, int message
 
 // OFFSET: 0x007C6CB0
 // FUNCTION: fn_09401
-UICashEmotionListWnd::UICashEmotionListWnd(UIWindowContext& windows, UIEditContext& edits)
+UICashEmotionListWnd::UICashEmotionListWnd(UIWindowContext& windows)
     : UIFrameWnd(windows, 0), m_placement(nullptr), m_basicList(nullptr), m_purchaseList(nullptr), m_unpurchasedList(nullptr), m_searchList(nullptr),
       m_tab(0), unknown_00D4(nullptr), m_searchEdit(nullptr), unknown_00DC(nullptr), unknown_00E0(nullptr), unknown_00E4(nullptr), m_currentList(nullptr),
-      m_period(nullptr), m_edits(&edits) {
+      m_period(nullptr) {
 }
 
 // OFFSET: 0x007C7240
@@ -2233,7 +2232,7 @@ void UICashEmotionListWnd::Slot15(int width, int height) {
   this->unknown_00E0 = this->CreateButton(252, 22, 37, 18, 191, "유저인터페이스\\cashemotion\\btn_shortui_%s.bmp", false);
   this->unknown_00E4 = this->CreateButton(247, 355, 42, 20, 526, "유저인터페이스\\cashemotion\\btn_buy_%s.bmp", true);
 
-  this->m_searchEdit = new (std::nothrow) UIEditCtrl2(*this->m_context, *this->m_edits);
+  this->m_searchEdit = new (std::nothrow) UIEditCtrl2(*this->m_context);
   if (this->m_searchEdit) {
     this->m_searchEdit->SetSize(160, 16);
     this->m_searchEdit->Move(61, 23);
diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
index c4719b08..f17257a1 100644
--- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
+++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
@@ -426,7 +426,7 @@ void UIDisconnectedServerMsgWnd::Slot15(int width, int height) {
 // FUNCTION: fn_12170
 void UIEmailAddressWnd::Slot15(int, int) {
   g_modeMgr.gameMode->SendMsg(10013, 0, 0, 0, 0);
-  this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edit = new UIEditCtrl(*this->m_context);
   this->m_edit->SetSize(this->geometry.width - 77, 16);
   this->m_edit->Move(15, 22);
   this->m_edit->maximum = 49;
@@ -6226,8 +6226,8 @@ UINpcTextEditDialogWnd::UINpcTextEditDialogWnd(UIWindowContext& windows)
 
 // OFFSET: 0x008C8B50
 // FUNCTION: fn_11968
-UIProhibitListWnd::UIProhibitListWnd(UIWindowContext& windows, UIEditContext& edits)
-    : UIFrameWnd(windows, 0), m_count(0), m_edits(&edits) {
+UIProhibitListWnd::UIProhibitListWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0), m_count(0) {
 }
 
 // OFFSET: 0x008C8BB0
@@ -6602,7 +6602,7 @@ void UINotifyQuestWnd::Slot15(int, int) {
 // OFFSET: 0x008E4F50
 // FUNCTION: fn_12188
 void UINpcEditDialogWnd::Slot15(int, int) {
-  this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->edit = new UIEditCtrl(*this->m_context);
   this->edit->SetSize(this->geometry.width - 77, 16);
   this->edit->Move(15, 22);
   this->edit->maximum = 12;
@@ -6630,7 +6630,7 @@ void UINpcEditDialogWnd::Slot15(int, int) {
 // OFFSET: 0x008E54B0
 // FUNCTION: fn_12189
 void UINpcTextEditDialogWnd::Slot15(int, int) {
-  this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->edit = new UIEditCtrl(*this->m_context);
   this->edit->SetSize(this->geometry.width - 77, 16);
   this->edit->Move(15, 22);
   this->edit->maximum = 70;
@@ -6736,7 +6736,7 @@ namespace {
 // OFFSET: 0x008E5A20
 // FUNCTION: fn_12190
 void UIPartyInvitationToWnd::Slot15(int, int) {
-  this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edit = new UIEditCtrl(*this->m_context);
   this->m_edit->SetSize(120, 20);
   this->m_edit->Move(20, 42);
   this->m_edit->maximum = 23;
@@ -7210,7 +7210,7 @@ int UIYourItemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::
 // OFFSET: 0x008E6B40
 // FUNCTION: fn_12192
 void UIPasswordWnd::Slot15(int, int) {
-  this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edit = new UIEditCtrl(*this->m_context);
   this->m_edit->SetSize(90, 16);
   this->m_edit->Move(15, 22);
   this->m_edit->maximum = 8;
@@ -8435,7 +8435,7 @@ void UIItemCollectionWnd::Paint() {
 // OFFSET: 0x008DB1F0
 // FUNCTION: fn_12158
 void UIAutoMessageWnd::Slot15(int, int) {
-  this->m_edit = new UIEditCtrl(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
+  this->m_edit = new UIEditCtrl(*this->m_context);
   this->m_edit->SetSize(this->geometry.width - 77, 16);
   this->m_edit->Move(15, 22);
   this->m_edit->maximum = 100;
@@ -10222,7 +10222,7 @@ int UIProhibitListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s
       if (!IsMonsterJob(g_session.m_aid)) {
         return 0;
       }
-      counter = new UICntWnd(*this->m_context, *this->m_edits);
+      counter = new UICntWnd(*this->m_context);
       counter->SetSize(0xB6, 0x2E);
       counter->Move((g_renderer->viewport.width - 640) / 2 + 200, ScaleByScreenHeight(200));
       g_windowMgr.AddRendered(counter);
@@ -10237,7 +10237,7 @@ int UIProhibitListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s
       if (a != 2 || !IsAdminAccount(g_session.m_aid)) {
         return 0;
       }
-      counter = new UICntWnd(*this->m_context, *this->m_edits);
+      counter = new UICntWnd(*this->m_context);
       counter->SetSize(0xB6, 0x2E);
       counter->Move((g_renderer->viewport.width - 640) / 2 + 200, ScaleByScreenHeight(200));
       g_windowMgr.AddRendered(counter);
diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp
index 120b7a63..0c6d8e38 100644
--- a/Source/UI/Buttons/UITextButton.cpp
+++ b/Source/UI/Buttons/UITextButton.cpp
@@ -2527,7 +2527,7 @@ void UITreeView::Slot15(int width, int height) {
   vertical->Slot22(verticalWidth, height);
   this->AddChild(this->verticalBar);
 
-  this->edit = new UIEditCtrl2(*this->m_context, *this->m_edit);
+  this->edit = new UIEditCtrl2(*this->m_context);
   this->edit->SetSize(100, 19);
   this->edit->Move(-100, -100);
   this->AddChild(this->edit);
diff --git a/Source/UI/CashShop/UICashShopWnd.cpp b/Source/UI/CashShop/UICashShopWnd.cpp
index bc3fc799..f9e21682 100644
--- a/Source/UI/CashShop/UICashShopWnd.cpp
+++ b/Source/UI/CashShop/UICashShopWnd.cpp
@@ -327,7 +327,7 @@ void UICashShopWnd::Slot15(int, int) {
   this->unknown_00E4->SetId(0x19F);
   this->AddChild(this->unknown_00E4);
 
-  this->unknown_00E0 = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->unknown_00E0 = new UIEditCtrl(*this->m_context);
   this->unknown_00E0->SetSize(0x123, 0xE);
   this->unknown_00E0->Move(0x5E, 0x206);
   this->unknown_00E0->preserveInput = 1;
@@ -354,7 +354,7 @@ void UICashShopWnd::Slot15(int, int) {
   buy->SetId(0xE0);
   this->AddChild(buy);
 
-  this->unknown_00F4 = new UIEditCtrl_Custom(*this->m_context, *this->m_editContext);
+  this->unknown_00F4 = new UIEditCtrl_Custom(*this->m_context);
   this->unknown_00F4->SetSize(0x3E, 0xE);
   this->unknown_00F4->Move(0x27C, 0x1C0);
   this->unknown_00F4->unknown_0128 = 1;
diff --git a/Source/UI/CashShop/UICashShopWnd.h b/Source/UI/CashShop/UICashShopWnd.h
index 1ec01e1a..a1800062 100644
--- a/Source/UI/CashShop/UICashShopWnd.h
+++ b/Source/UI/CashShop/UICashShopWnd.h
@@ -16,7 +16,6 @@ class UIEditCtrl;
 class UIEditCtrl_Custom;
 class UIScrollBar_Custom;
 class UIStaticBitmap;
-struct UIEditContext;
 
 class UICashShopWnd_Banner : public UIWindow {
 public:
@@ -129,7 +128,6 @@ public:
   /* 00F8 */ std::vector<UICashShopWnd_Item*> m_itemWindows;
   /* 0104 */ UICashShopWnd_Cart* m_cart;
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 void FormatMessageBuffer(char* buffer, const char* format, ...);
diff --git a/Source/UI/Chat/UISubChatHisWnd.cpp b/Source/UI/Chat/UISubChatHisWnd.cpp
index 364e774f..2e86d77a 100644
--- a/Source/UI/Chat/UISubChatHisWnd.cpp
+++ b/Source/UI/Chat/UISubChatHisWnd.cpp
@@ -197,7 +197,7 @@ void UISubChatHisWnd::Slot15(int width, int height) {
     }
   }
 
-  this->m_edit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
+  this->m_edit = new UIEditCtrl2(*this->m_context);
   this->m_edit->SetSize(100, 19);
   this->m_edit->Move(-100, -100);
   this->AddChild(this->m_edit);
@@ -207,8 +207,8 @@ void UISubChatHisWnd::Slot15(int width, int height) {
 
 // OFFSET: 0x00912340
 // FUNCTION: fn_12529
-UISubChatHisWnd::UISubChatHisWnd(UIWindowContext& windows, UIEditContext& edit)
-    : UIFrameWnd(windows, 0), m_editContext(&edit) {
+UISubChatHisWnd::UISubChatHisWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
   this->m_saved = nullptr;
   this->m_resizer = nullptr;
   this->m_chatBox = nullptr;
diff --git a/Source/UI/Chat/UISubChatHisWnd.h b/Source/UI/Chat/UISubChatHisWnd.h
index e529647b..f5dd86d5 100644
--- a/Source/UI/Chat/UISubChatHisWnd.h
+++ b/Source/UI/Chat/UISubChatHisWnd.h
@@ -11,7 +11,6 @@ class UIEditCtrl;
 class UIResizer;
 class UIWindowMgr;
 struct SubChatHisWndInfo;
-struct UIEditContext;
 
 struct SubChatHistoryState {
   /* 0000 */ int unknown_0000;
@@ -28,7 +27,7 @@ class UISubChatHisWnd : public UIFrameWnd {
 
 public:
   UISubChatHisWnd();
-  UISubChatHisWnd(UIWindowContext& windows, UIEditContext& edit);
+  UISubChatHisWnd(UIWindowContext& windows);
   void Resize(int width, int height) override;
   void Move(int x, int y) override;
   void Slot11() override;
@@ -61,7 +60,6 @@ private:
   /* 0114 */ std::string m_name;
   /* 012C */ UIEditCtrl* m_edit;
   void* unknown_controls;
-  UIEditContext* m_editContext;
   void* unknown_listContext;
 };
 
diff --git a/Source/UI/Dialogs/UIEditctrlWnd.cpp b/Source/UI/Dialogs/UIEditctrlWnd.cpp
index b11ca681..8c21f8dd 100644
--- a/Source/UI/Dialogs/UIEditctrlWnd.cpp
+++ b/Source/UI/Dialogs/UIEditctrlWnd.cpp
@@ -42,8 +42,8 @@ const char* g_miniMapMemoLineFormat = "%d\t%d\t%s\r\n";
 
 // OFFSET: 0x0099B0C0
 // FUNCTION: fn_13549
-UIEditctrlWnd::UIEditctrlWnd(UIWindowContext& windows, UIEditContext& edit)
-    : UIFrameWnd(windows, 0), m_editContext(&edit) {
+UIEditctrlWnd::UIEditctrlWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
 }
 
 // OFFSET: 0x0099B120
@@ -155,7 +155,7 @@ void UIEditctrlWnd::Slot15(int, int) {
   this->AddCloseButton(LookupMessage(2741), 0);
   this->AddNumberedButton(184, 205, 19, "minimap\\memo_ok", LookupMessage(2754), true);
 
-  this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->edit = new UIEditCtrl(*this->m_context);
   this->edit->SetSize(200, 18);
   this->edit->Move(5, 19);
   this->edit->maximum = 20;
diff --git a/Source/UI/Dialogs/UIEditctrlWnd.h b/Source/UI/Dialogs/UIEditctrlWnd.h
index 08494a91..1034589f 100644
--- a/Source/UI/Dialogs/UIEditctrlWnd.h
+++ b/Source/UI/Dialogs/UIEditctrlWnd.h
@@ -3,12 +3,11 @@
 
 #include "UI/Window/UIFrameWnd.h"
 
-struct UIEditContext;
 class UIEditCtrl;
 
 class UIEditctrlWnd : public UIFrameWnd {
 public:
-  UIEditctrlWnd(UIWindowContext& windows, UIEditContext& edit);
+  UIEditctrlWnd(UIWindowContext& windows);
   void Slot15(int width, int height) override;
   void Paint() override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override;
@@ -17,7 +16,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Dialogs/UIEmailAddressWnd.cpp b/Source/UI/Dialogs/UIEmailAddressWnd.cpp
index d0b58736..1a5e124f 100644
--- a/Source/UI/Dialogs/UIEmailAddressWnd.cpp
+++ b/Source/UI/Dialogs/UIEmailAddressWnd.cpp
@@ -20,6 +20,6 @@ int UIEmailAddressWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s
 
 // OFFSET: 0x008C7800
 // FUNCTION: fn_11939
-UIEmailAddressWnd::UIEmailAddressWnd(UIWindowContext& windows, UIEditContext& edits)
-    : UIFrameWnd(windows, 0), m_editContext(&edits) {
+UIEmailAddressWnd::UIEmailAddressWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
 }
diff --git a/Source/UI/Dialogs/UIEmailAddressWnd.h b/Source/UI/Dialogs/UIEmailAddressWnd.h
index 8e3a0c35..c0e702d8 100644
--- a/Source/UI/Dialogs/UIEmailAddressWnd.h
+++ b/Source/UI/Dialogs/UIEmailAddressWnd.h
@@ -3,12 +3,11 @@
 
 #include "UI/Window/UIFrameWnd.h"
 
-struct UIEditContext;
 class UIEditCtrl;
 
 class UIEmailAddressWnd : public UIFrameWnd {
 public:
-  UIEmailAddressWnd(UIWindowContext& windows, UIEditContext& edits);
+  UIEmailAddressWnd(UIWindowContext& windows);
   void Slot15(int width, int height) override;
   void Paint() override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override;
@@ -20,7 +19,6 @@ public:
   /* 00B4 */ UIEditCtrl* m_edit;
 
 protected:
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp b/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp
index 01f6b254..6c4146f1 100644
--- a/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp
+++ b/Source/UI/Dialogs/UIGraffiStrboxWnd.cpp
@@ -9,7 +9,7 @@
 // OFFSET: 0x008E1210
 // FUNCTION: fn_12174
 void UIGraffiStrboxWnd::Slot15(int, int) {
-  this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->edit = new UIEditCtrl(*this->m_context);
   this->edit->SetSize(240, 16);
   this->edit->Move(22, 50);
   this->edit->maximum = 20;
@@ -38,6 +38,6 @@ void UIGraffiStrboxWnd::Slot15(int, int) {
 
 // OFFSET: 0x008C7C50
 // FUNCTION: fn_11942
-UIGraffiStrboxWnd::UIGraffiStrboxWnd(UIWindowContext& windows, UIEditContext& edits)
-    : UIFrameWnd(windows, 0), m_editContext(&edits) {
+UIGraffiStrboxWnd::UIGraffiStrboxWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
 }
diff --git a/Source/UI/Dialogs/UIGraffiStrboxWnd.h b/Source/UI/Dialogs/UIGraffiStrboxWnd.h
index 252fd70b..5744975a 100644
--- a/Source/UI/Dialogs/UIGraffiStrboxWnd.h
+++ b/Source/UI/Dialogs/UIGraffiStrboxWnd.h
@@ -3,12 +3,11 @@
 
 #include "UI/Window/UIFrameWnd.h"
 
-struct UIEditContext;
 class UIEditCtrl;
 
 class UIGraffiStrboxWnd : public UIFrameWnd {
 public:
-  UIGraffiStrboxWnd(UIWindowContext& windows, UIEditContext& edits);
+  UIGraffiStrboxWnd(UIWindowContext& windows);
   void Slot15(int width, int height) override;
   void Paint() override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
@@ -21,7 +20,6 @@ public:
   UIEditCtrl* edit;
 
 protected:
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Dialogs/UINpcEditDialogWnd.h b/Source/UI/Dialogs/UINpcEditDialogWnd.h
index 7ee8cbde..ae8483f9 100644
--- a/Source/UI/Dialogs/UINpcEditDialogWnd.h
+++ b/Source/UI/Dialogs/UINpcEditDialogWnd.h
@@ -7,7 +7,6 @@ class UIEditCtrl;
 class UIItemTagOnMegaPhone;
 struct ITEM_INFO;
 
-struct UIEditContext;
 
 class UINpcEditDialogWnd : public UIFrameWnd {
 public:
@@ -24,7 +23,6 @@ public:
   /* 00B8 */ int unknown_00B8;
 
 protected:
-  UIEditContext* m_editContext;
 };
 
 class UINpcTextEditDialogWnd : public UINpcEditDialogWnd {
diff --git a/Source/UI/Dialogs/UIPasswordWnd.h b/Source/UI/Dialogs/UIPasswordWnd.h
index a3477cf4..cf3c0a5e 100644
--- a/Source/UI/Dialogs/UIPasswordWnd.h
+++ b/Source/UI/Dialogs/UIPasswordWnd.h
@@ -6,7 +6,6 @@
 class UIButton;
 class UIEditCtrl;
 class UIStaticText;
-struct UIEditContext;
 
 class UIItemDropCntWnd : public UIFrameWnd {
 public:
@@ -50,7 +49,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 class UIStorePasswordInputWnd : public UIFrameWnd {
diff --git a/Source/UI/Dialogs/UIProhibitListWnd.h b/Source/UI/Dialogs/UIProhibitListWnd.h
index c11f2d82..56332d29 100644
--- a/Source/UI/Dialogs/UIProhibitListWnd.h
+++ b/Source/UI/Dialogs/UIProhibitListWnd.h
@@ -3,11 +3,10 @@
 
 #include "UI/Window/UIFrameWnd.h"
 
-struct UIEditContext;
 
 class UIProhibitListWnd : public UIFrameWnd {
 public:
-  UIProhibitListWnd(UIWindowContext& windows, UIEditContext& edits);
+  UIProhibitListWnd(UIWindowContext& windows);
   /* 00B4 */ int m_count;
   /* 00B8 */ std::uint32_t m_aid;
 
@@ -18,7 +17,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_edits;
 };
 
 #endif
diff --git a/Source/UI/Dialogs/UITipboxWnd.h b/Source/UI/Dialogs/UITipboxWnd.h
index ace60797..52b67fb0 100644
--- a/Source/UI/Dialogs/UITipboxWnd.h
+++ b/Source/UI/Dialogs/UITipboxWnd.h
@@ -12,7 +12,6 @@ class UIEditCtrl;
 class UIListBoxID;
 class UITagTextViewer;
 class UIBitmapButton;
-struct UIEditContext;
 
 struct TipBoxAnimation {
   /* 0000 */ std::uint32_t moveStart;
@@ -70,7 +69,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #if defined(_WIN32) && !defined(_WIN64)
diff --git a/Source/UI/Edit/UIEditBoxEx.cpp b/Source/UI/Edit/UIEditBoxEx.cpp
index 9485e578..b431398c 100644
--- a/Source/UI/Edit/UIEditBoxEx.cpp
+++ b/Source/UI/Edit/UIEditBoxEx.cpp
@@ -659,9 +659,8 @@ void CUIEditCtrlEx::SetText(const char* value) {
 // OFFSET: 0x009E4410
 // FUNCTION: fn_14432
 void CUIEditBoxEx::Create(int width, int height, bool withScrollBar) {
-  UIEditContext& edits = this->edit->EditContext();
   this->RemoveChild(this->edit, 1);
-  CUIEditCtrlEx* edit = new CUIEditCtrlEx(*this->m_context, edits);
+  CUIEditCtrlEx* edit = new CUIEditCtrlEx(*this->m_context);
   this->edit = edit;
   edit->SetSize(width, height);
   if (withScrollBar) {
@@ -764,7 +763,7 @@ void CUIEditCtrlEx::PaintTextLines() {
   }
 }
 
-CUIEditCtrlEx::CUIEditCtrlEx(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl3(windows, edit) {
+CUIEditCtrlEx::CUIEditCtrlEx(UIWindowContext& windows) : UIEditCtrl3(windows) {
   this->normalColor = 0;
   this->unknown_018C = 0;
   this->unknown_0190 = 0;
diff --git a/Source/UI/Edit/UIEditBoxEx.h b/Source/UI/Edit/UIEditBoxEx.h
index 65fd8771..d8135d8d 100644
--- a/Source/UI/Edit/UIEditBoxEx.h
+++ b/Source/UI/Edit/UIEditBoxEx.h
@@ -20,7 +20,7 @@ struct EditLine {
 
 class CUIEditCtrlEx : public UIEditCtrl3 {
 public:
-  CUIEditCtrlEx(UIWindowContext& windows, UIEditContext& edit);
+  CUIEditCtrlEx(UIWindowContext& windows);
   void Paint() override;
   void Invalidate() override;
   void SelectAll() override;
@@ -36,9 +36,6 @@ public:
   void ResetDragState();
   void DrawCaret(int x, int y);
   void PaintTextLines();
-  UIEditContext& EditContext() {
-    return *this->m_edit;
-  }
   int LeadingBytesFitting(const std::string& text, int width);
   int TrailingOffsetFitting(const std::string& text, int width);
 
diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp
index 6adf3fab..cc42c5a7 100644
--- a/Source/UI/Edit/UIEditCtrl.cpp
+++ b/Source/UI/Edit/UIEditCtrl.cpp
@@ -251,10 +251,10 @@ UIEditCtrl::UIEditCtrl(const UIEditCtrl& other)
 
 // OFFSET: 0x0084FAE0
 // FUNCTION: fn_10663
-UIEditCtrl::UIEditCtrl(UIWindowContext& windows, UIEditContext& edit)
+UIEditCtrl::UIEditCtrl(UIWindowContext& windows)
     : UIWindow(windows, 0), anchor(0), cursor(0), mask(0), maximum(255), flat(1), red(255), green(255), blue(255), borderRed(0), borderGreen(0), borderBlue(0),
       textColor(0), secondColor(0xFFFFFFFF), firstVisible(0), textY(0), invalidatesParent(0), disabled(0), unknown_00F0(0), topPadding(0), preserveInput(0),
-      m_edit(&edit) {
+      unknown_011C(nullptr) {
   this->text.reserve(255);
 }
 
@@ -588,7 +588,7 @@ UISkillListWnd::UISkillListWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0
 }
 
 // INLINED
-UIEditCtrlWheel::UIEditCtrlWheel(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit) {
+UIEditCtrlWheel::UIEditCtrlWheel(UIWindowContext& windows) : UIEditCtrl(windows) {
 }
 
 // OFFSET: 0x009701B0
diff --git a/Source/UI/Edit/UIEditCtrl.h b/Source/UI/Edit/UIEditCtrl.h
index caa66c93..f4b0bc65 100644
--- a/Source/UI/Edit/UIEditCtrl.h
+++ b/Source/UI/Edit/UIEditCtrl.h
@@ -17,28 +17,13 @@ class UIItemTagButton;
 struct ITEM_INFO;
 class UIItemTagOnChat;
 
-struct UIEditContext {
-  unsigned char& password;
-  const InputCharset& charset;
-  WindowManagerWindows& windows;
-  const BitmapImage& colorChip;
-  const int& candidateCursor;
-  UIWindow* const& candidateWindow;
-  UIWindow* const& readingWindow;
-  UIWindow* const& otherChatInput;
-  const bool& linkInputRestricted;
-  UIWindow* const& permittedLinkInput;
-  const int& screenWidth;
-  const int& screenHeight;
-};
-
 class UIEditCtrl : public UIWindow {
   friend class UIMacroDetectorWnd;
 
 public:
   UIEditCtrl();
   UIEditCtrl(const UIEditCtrl& other);
-  UIEditCtrl(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl(UIWindowContext& windows);
   ~UIEditCtrl() override;
   bool Slot05() override;
   void Paint() override;
@@ -96,7 +81,7 @@ public:
   /* 0104 */ std::string linkedText;
 
 protected:
-  UIEditContext* m_edit;
+  void* unknown_011C;
   void PaintTextWithPolicy(const std::string* placeholder, std::uint32_t placeholderColor, bool placeholderEnabled);
   bool RemoveInvalidLink(std::list<UIWindow*>::iterator& entry);
   void SnapLinkSelection(std::size_t prefix, std::size_t bytes);
@@ -108,14 +93,14 @@ private:
 
 class UIEditCtrlWheel : public UIEditCtrl {
 public:
-  UIEditCtrlWheel(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrlWheel(UIWindowContext& windows);
   ~UIEditCtrlWheel() override;
   void Slot35(int value) override;
 };
 
 class UIEditCtrl2 : public UIEditCtrl {
 public:
-  UIEditCtrl2(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl2(UIWindowContext& windows);
   ~UIEditCtrl2() override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
 };
@@ -123,7 +108,7 @@ public:
 class UIEditCtrl3 : public UIEditCtrl2 {
 public:
   UIEditCtrl3();
-  UIEditCtrl3(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl3(UIWindowContext& windows);
   UIEditCtrl3(const UIEditCtrl3& other);
   ~UIEditCtrl3() override;
   void Slot15(int width, int height) override;
@@ -185,7 +170,7 @@ public:
 
 class UIEditCtrl4 : public UIEditCtrl {
 public:
-  UIEditCtrl4(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl4(UIWindowContext& windows);
   ~UIEditCtrl4() override;
   void Slot23() override;
   void PaintText() override;
@@ -200,7 +185,7 @@ public:
 
 class UIEditCtrl5 : public UIEditCtrl4 {
 public:
-  UIEditCtrl5(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl5(UIWindowContext& windows);
   ~UIEditCtrl5() override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
 };
@@ -216,7 +201,7 @@ public:
 class UIChatEditCtrl : public UIEditCtrl {
 public:
   UIChatEditCtrl();
-  UIChatEditCtrl(UIWindowContext& windows, UIEditContext& edit);
+  UIChatEditCtrl(UIWindowContext& windows);
   void Paint() override;
   void Slot25(int x, int y) override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
@@ -233,7 +218,7 @@ public:
 
 class UIEditCtrl_OldList : public UIEditCtrl {
 public:
-  UIEditCtrl_OldList(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl_OldList(UIWindowContext& windows);
   void Paint() override;
   void Slot35(int value) override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override;
@@ -245,7 +230,7 @@ public:
 
 class UIWhisperEditCtrl : public UIEditCtrl {
 public:
-  UIWhisperEditCtrl(UIWindowContext& windows, UIEditContext& edit);
+  UIWhisperEditCtrl(UIWindowContext& windows);
   void Slot23() override;
   void Slot24(int retained) override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
@@ -258,7 +243,7 @@ public:
 class UIEditCtrlVarId : public UIEditCtrl {
 public:
   // INLINED
-  UIEditCtrlVarId(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit) {}
+  UIEditCtrlVarId(UIWindowContext& windows) : UIEditCtrl(windows) {}
   // INLINED
   UIEditCtrlVarId() {}
   void Slot24(int retained) override;
@@ -280,7 +265,7 @@ public:
   /* 007C */ UIEditCtrlVarId* fields[2];
 
 protected:
-  UIEditContext* m_edit;
+  void* unknown_slot;
 
 public:
   /* 0084 */ int unknown_0084;
diff --git a/Source/UI/Edit/UIEditCtrl_Currency.cpp b/Source/UI/Edit/UIEditCtrl_Currency.cpp
index f47e7445..540db947 100644
--- a/Source/UI/Edit/UIEditCtrl_Currency.cpp
+++ b/Source/UI/Edit/UIEditCtrl_Currency.cpp
@@ -2,13 +2,13 @@
 
 // OFFSET: 0x0086D250
 // FUNCTION: fn_11043
-UIEditCtrl_Custom::UIEditCtrl_Custom(UIWindowContext& windows, UIEditContext& edit)
-    : UIEditCtrl2(windows, edit), unknown_011C(0), unknown_0120(0), unknown_0124(0), unknown_0128(0) {
+UIEditCtrl_Custom::UIEditCtrl_Custom(UIWindowContext& windows)
+    : UIEditCtrl2(windows), unknown_011C(0), unknown_0120(0), unknown_0124(0), unknown_0128(0) {
 }
 
 // OFFSET: 0x0086D1B0
 // FUNCTION: fn_11042
-UIEditCtrl_Currency::UIEditCtrl_Currency(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl_Custom(windows, edit) {
+UIEditCtrl_Currency::UIEditCtrl_Currency(UIWindowContext& windows) : UIEditCtrl_Custom(windows) {
   this->unknown_0128 = 1;
   this->formattedLength = 0;
 }
diff --git a/Source/UI/Edit/UIEditCtrl_Currency.h b/Source/UI/Edit/UIEditCtrl_Currency.h
index 1c1e723c..9f961802 100644
--- a/Source/UI/Edit/UIEditCtrl_Currency.h
+++ b/Source/UI/Edit/UIEditCtrl_Currency.h
@@ -9,7 +9,7 @@
 class UIEditCtrl_Custom : public UIEditCtrl2 {
 public:
   UIEditCtrl_Custom();
-  UIEditCtrl_Custom(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl_Custom(UIWindowContext& windows);
   void PaintText() override;
   void Synchronize() override;
   void Trim() override;
@@ -24,7 +24,7 @@ public:
 class UIEditCtrl_Currency : public UIEditCtrl_Custom {
 public:
   UIEditCtrl_Currency();
-  UIEditCtrl_Currency(UIWindowContext& windows, UIEditContext& edit);
+  UIEditCtrl_Currency(UIWindowContext& windows);
   void Slot19() override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
 
diff --git a/Source/UI/Edit/UIEditCtrl_OldList.cpp b/Source/UI/Edit/UIEditCtrl_OldList.cpp
index 02163cc4..77b4aa36 100644
--- a/Source/UI/Edit/UIEditCtrl_OldList.cpp
+++ b/Source/UI/Edit/UIEditCtrl_OldList.cpp
@@ -2,6 +2,6 @@
 
 // OFFSET: 0x0084FCC0
 // FUNCTION: fn_10664
-UIEditCtrl_OldList::UIEditCtrl_OldList(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), historyIndex(-1) {
+UIEditCtrl_OldList::UIEditCtrl_OldList(UIWindowContext& windows) : UIEditCtrl(windows), historyIndex(-1) {
   this->textY = 3;
 }
diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp
index 871d836c..f9530afe 100644
--- a/Source/UI/Edit/UIEditVariants.cpp
+++ b/Source/UI/Edit/UIEditVariants.cpp
@@ -23,7 +23,7 @@
 
 // OFFSET: 0x0084F250
 // FUNCTION: fn_10657
-UIEditCtrl2::UIEditCtrl2(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit) {
+UIEditCtrl2::UIEditCtrl2(UIWindowContext& windows) : UIEditCtrl(windows) {
 }
 
 // OFFSET: 0x008515E0
@@ -298,7 +298,7 @@ void UIEditCtrl3::HandleInputMessage(unsigned key, std::intptr_t data) {
 
 // OFFSET: 0x0084F570
 // FUNCTION: fn_10659
-UIEditCtrl3::UIEditCtrl3(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl2(windows, edit) {
+UIEditCtrl3::UIEditCtrl3(UIWindowContext& windows) : UIEditCtrl2(windows) {
   this->unknown_0130 = 0;
   this->unknown_0134 = 0;
   this->unknown_0138 = 14;
@@ -753,7 +753,7 @@ int UIEditCtrl::MeasureText(const std::string& text, const int& bytes) {
 
 // OFFSET: 0x0084F7B0
 // FUNCTION: fn_10660
-UIEditCtrl4::UIEditCtrl4(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), placeholderColor(0xFFFFFFFFu), placeholderEnabled(0) {
+UIEditCtrl4::UIEditCtrl4(UIWindowContext& windows) : UIEditCtrl(windows), placeholderColor(0xFFFFFFFFu), placeholderEnabled(0) {
 }
 
 // OFFSET: 0x00852870
@@ -809,7 +809,7 @@ void UIEditCtrl4::SetPlaceholderColor(std::uint32_t color) {
 
 // OFFSET: 0x0084F7B0
 // FUNCTION: fn_10661
-UIEditCtrl5::UIEditCtrl5(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl4(windows, edit) {
+UIEditCtrl5::UIEditCtrl5(UIWindowContext& windows) : UIEditCtrl4(windows) {
 }
 
 // OFFSET: 0x008528F0
@@ -915,7 +915,7 @@ void UIBitmapEditCtrl::SetBitmapName(const char* name) {
 
 // OFFSET: 0x0084EE90
 // FUNCTION: fn_10654
-UIChatEditCtrl::UIChatEditCtrl(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), unknown_0140(0), historyLimit(30) {
+UIChatEditCtrl::UIChatEditCtrl(UIWindowContext& windows) : UIEditCtrl(windows), unknown_0140(0), historyLimit(30) {
   this->history.reserve(this->historyLimit);
   this->unknown_0144 = 0;
 }
@@ -1058,7 +1058,7 @@ int UIEditCtrl_OldList::SendMsg(UIWindow* sender, int message, std::intptr_t arg
 void UIShowAndEditTimeCtrl::Slot15(int, int) {
   for (int i = 0; i < 2; ++i) {
     UIEditCtrlVarId*& field = this->fields[i];
-    field = new UIEditCtrlVarId(*this->m_context, *this->m_edit);
+    field = new UIEditCtrlVarId(*this->m_context);
     field->SetSize(20, 18);
     field->Background(232, 232, 232);
     field->Border(192, 192, 192);
diff --git a/Source/UI/Edit/UIWhisperEditCtrl.cpp b/Source/UI/Edit/UIWhisperEditCtrl.cpp
index 1c4bf379..58cbebd2 100644
--- a/Source/UI/Edit/UIWhisperEditCtrl.cpp
+++ b/Source/UI/Edit/UIWhisperEditCtrl.cpp
@@ -2,5 +2,5 @@
 
 // OFFSET: 0x00850890
 // FUNCTION: fn_10681
-UIWhisperEditCtrl::UIWhisperEditCtrl(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), historyIndex(0) {
+UIWhisperEditCtrl::UIWhisperEditCtrl(UIWindowContext& windows) : UIEditCtrl(windows), historyIndex(0) {
 }
diff --git a/Source/UI/Emotion/UIEmotionWnd.cpp b/Source/UI/Emotion/UIEmotionWnd.cpp
index 08ccde64..d4facb61 100644
--- a/Source/UI/Emotion/UIEmotionWnd.cpp
+++ b/Source/UI/Emotion/UIEmotionWnd.cpp
@@ -47,7 +47,7 @@ void UIEmotionWnd::Slot15(int, int) {
   auto* emotions = reinterpret_cast<EmotionHotkeys*>(&g_session.unknown_0FF8);
 
   for (int i = 0; i < 10; ++i) {
-    UIEditCtrl2* edit = new UIEditCtrl2(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
+    UIEditCtrl2* edit = new UIEditCtrl2(*this->m_context);
     this->m_edits[i] = edit;
     edit->SetSize(270, 16);
     edit->Move(83, y - 3);
diff --git a/Source/UI/Guild/UIGuildHelperWnd.cpp b/Source/UI/Guild/UIGuildHelperWnd.cpp
index 6bf0407e..25d6ba20 100644
--- a/Source/UI/Guild/UIGuildHelperWnd.cpp
+++ b/Source/UI/Guild/UIGuildHelperWnd.cpp
@@ -271,7 +271,7 @@ int UIGuildTipWnd::SendMsg(UIWindow*, int message, std::intptr_t a1, std::intptr
 // OFFSET: 0x00958070
 // FUNCTION: fn_13055
 void UICreateGuildWnd::Slot15(int, int) {
-  this->m_nameEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_nameEdit = new UIEditCtrl(*this->m_context);
   this->m_nameEdit->SetSize(124, 20);
   this->m_nameEdit->Move(13, 42);
   this->m_nameEdit->maximum = 23;
diff --git a/Source/UI/Guild/UIGuildHelperWnd.h b/Source/UI/Guild/UIGuildHelperWnd.h
index c7d7993f..0d328ce5 100644
--- a/Source/UI/Guild/UIGuildHelperWnd.h
+++ b/Source/UI/Guild/UIGuildHelperWnd.h
@@ -3,7 +3,6 @@
 
 #include "UI/Window/UIFrameWnd.h"
 
-struct UIEditContext;
 struct GuildHelperWndInfo;
 class UIBitmapButton;
 class UIEditCtrl;
@@ -47,7 +46,6 @@ public:
 protected:
   /* 00BC */ UIEditCtrl* m_nameEdit;
   /* 00C0 */ int m_mode;
-  UIEditContext* m_editContext;
 };
 
 class UIGuildTipWnd : public UIFrameWnd {
diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp
index f5e4f6dd..76e5daa7 100644
--- a/Source/UI/Guild/UIGuildWnd.cpp
+++ b/Source/UI/Guild/UIGuildWnd.cpp
@@ -2018,7 +2018,7 @@ void UIGuildNoticeWnd::Slot15(int, int) {
   g_windowMgr.SetFocus(this->m_titleEdit);
   this->m_titleEdit->SetText(g_guildInfo.unknown_0030.c_str());
 
-  this->m_bodyEdit = new UIEditCtrl3(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
+  this->m_bodyEdit = new UIEditCtrl3(*this->m_context);
   this->m_bodyEdit->SetSize(this->geometry.width - 10, 156);
   this->m_bodyEdit->invalidatesParent = 1;
   this->m_bodyEdit->Move(5, 104);
diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp
index 2e19828e..a2c5b9e3 100644
--- a/Source/UI/Lists/UIScrollBar.cpp
+++ b/Source/UI/Lists/UIScrollBar.cpp
@@ -1703,7 +1703,7 @@ void UITabControl::Configure(
   this->inactiveTextColor = inactiveTextColor;
   this->ClearTabs();
 
-  this->edit = new UIEditCtrl2(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
+  this->edit = new UIEditCtrl2(*this->m_context);
   this->edit->SetSize(100, 19);
   this->edit->Move(-100, -100);
   this->AddChild(this->edit);
diff --git a/Source/UI/Lists/UITreeView.cpp b/Source/UI/Lists/UITreeView.cpp
index 8df13410..d6ee8ad3 100644
--- a/Source/UI/Lists/UITreeView.cpp
+++ b/Source/UI/Lists/UITreeView.cpp
@@ -2,7 +2,7 @@
 
 // OFFSET: 0x0086F180
 // FUNCTION: fn_11087
-UITreeView::UITreeView(UIWindowContext& windows, UIEditContext& edit) : UIWindow(windows, 0), m_edit(&edit) {
+UITreeView::UITreeView(UIWindowContext& windows) : UIWindow(windows, 0) {
   this->itemPadding = 5;
   this->itemHeight = 20;
   this->itemCount = 0;
diff --git a/Source/UI/Lists/UITreeView.h b/Source/UI/Lists/UITreeView.h
index 2b26c62d..310cc015 100644
--- a/Source/UI/Lists/UITreeView.h
+++ b/Source/UI/Lists/UITreeView.h
@@ -9,7 +9,6 @@
 
 class UIScrollBar;
 class UIEditCtrl2;
-struct UIEditContext;
 class UITVBitmapButton;
 class UITVTextButton;
 
@@ -37,7 +36,7 @@ static_assert(offsetof(UITreeNode, children) == 0x180);
 
 class UITreeView : public UIWindow {
 public:
-  UITreeView(UIWindowContext& windows, UIEditContext& edit);
+  UITreeView(UIWindowContext& windows);
   void Resize(int width, int height) override;
   void Slot15(int width, int height) override;
   void Paint() override;
@@ -70,7 +69,6 @@ protected:
   /* 00A8 */ int unknown_00A8;
   /* 00AC */ unsigned char unknown_00AC;
 
-  UIEditContext* m_edit;
   void* unknown_controls;
   /* 00B0 */ int unknown_00B0;
 };
diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp
index f05bb391..bed8a574 100644
--- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp
+++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp
@@ -54,7 +54,7 @@ void UIAdvenPartyBoardWnd::Slot11() {
 void UIAdvenPartyBoardWnd::Slot15(int, int) {
   auto& owner = *this->m_board;
 
-  this->minimum = new UIEditCtrl2(*this->m_context, owner.edits);
+  this->minimum = new UIEditCtrl2(*this->m_context);
   this->minimum->SetSize(25, 14);
   this->minimum->invalidatesParent = 1;
   this->minimum->maximum = 3;
@@ -67,7 +67,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) {
   this->minimum->Show(1);
   this->AddChild(this->minimum);
 
-  this->maximum = new UIEditCtrl2(*this->m_context, owner.edits);
+  this->maximum = new UIEditCtrl2(*this->m_context);
   this->maximum->SetSize(25, 14);
   this->maximum->invalidatesParent = 1;
   this->maximum->maximum = 3;
@@ -93,7 +93,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) {
     this->AddChild(job);
   }
 
-  auto* memo = new UIEditCtrl5(*this->m_context, owner.edits);
+  auto* memo = new UIEditCtrl5(*this->m_context);
   this->memo = memo;
   memo->SetSize(116, 14);
   memo->maximum = 150;
diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.h b/Source/UI/Party/UIAdvenPartyBoardWnd.h
index b9c9f3a4..d1efbaa9 100644
--- a/Source/UI/Party/UIAdvenPartyBoardWnd.h
+++ b/Source/UI/Party/UIAdvenPartyBoardWnd.h
@@ -14,7 +14,6 @@ class UIEditCtrl;
 class UIJobSlotButton;
 class UIComboBoxDef2Wnd;
 class UIPartyInfoWnd;
-struct UIEditContext;
 struct UIComboBoxHeaderContext;
 struct PartyRowContext;
 struct ExtendedListLine;
@@ -30,7 +29,6 @@ struct StopRecruitingContext;
 struct WindowOrdering;
 
 struct UIAdvenPartyBoardContext {
-  UIEditContext& edits;
   UIComboBoxHeaderContext& combos;
   PartyRowContext& rows;
   AgencyRequestContext& requests;
diff --git a/Source/UI/Party/UIPartySettingWnd.h b/Source/UI/Party/UIPartySettingWnd.h
index fc996bff..b610ed77 100644
--- a/Source/UI/Party/UIPartySettingWnd.h
+++ b/Source/UI/Party/UIPartySettingWnd.h
@@ -5,7 +5,6 @@
 #include "UI/Window/UIFrameWnd.h"
 
 class UIEditCtrl;
-struct UIEditContext;
 struct WindowPlacement;
 
 class UIPartySettingWnd : public UIFrameWnd {
@@ -34,7 +33,6 @@ public:
   /* 00E0 */ UIEditCtrl* m_edit;
 
 protected:
-  UIEditContext* m_editContext;
 };
 
 class UIPartyInvitationToWnd : public UIPartySettingWnd {
diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp
index 943acf9f..48b0fdcc 100644
--- a/Source/UI/Party/UIRegisterPartyWnd.cpp
+++ b/Source/UI/Party/UIRegisterPartyWnd.cpp
@@ -93,7 +93,7 @@ void UIRegisterPartyWnd::Slot15(int, int) {
   const int level = owner.playerLevel;
 
   const auto edit = [&](int x, int value) {
-    auto* control = new UIEditCtrl(*this->m_context, owner.edits);
+    auto* control = new UIEditCtrl(*this->m_context);
     control->SetSize(25, 16);
     control->Move(x, 47);
     control->invalidatesParent = 1;
@@ -127,7 +127,7 @@ void UIRegisterPartyWnd::Slot15(int, int) {
   }
 
   label(LookupMessage(3359), 10, 121, this->geometry.width - 32);
-  this->memo = new UIEditCtrl(*this->m_context, owner.edits);
+  this->memo = new UIEditCtrl(*this->m_context);
   this->memo->SetSize(139, 14);
   this->memo->maximum = 24;
   this->memo->TextColor(0, 0xFFFFFFFFu);
@@ -220,7 +220,6 @@ void UIRegisterPartyWnd::SetInfo(CAdvenPartyInfo value) {
 
 // INLINED
 const char* UIRegisterPartyWnd::Text(UIEditCtrl& control) const {
-  const auto& edit = this->m_registration->edits;
   return g_windowMgr.hoverWindow == &control ? g_serverLanguage->text.c_str() : control.text.c_str();
 }
 
diff --git a/Source/UI/Party/UIRegisterPartyWnd.h b/Source/UI/Party/UIRegisterPartyWnd.h
index ff5f1ba3..ed45d17c 100644
--- a/Source/UI/Party/UIRegisterPartyWnd.h
+++ b/Source/UI/Party/UIRegisterPartyWnd.h
@@ -12,11 +12,9 @@ class UIBasicButton;
 class ForbiddenWords;
 struct AgencyRequestContext;
 struct RegisterPartyContext;
-struct UIEditContext;
 struct UIComboBoxHeaderContext;
 
 struct UIRegisterPartyContext {
-  UIEditContext& edits;
   UIComboBoxHeaderContext& combos;
   ForbiddenWords& forbidden;
   AgencyRequestContext& requests;
diff --git a/Source/UI/Rodex/UIRodexComposeWnd.cpp b/Source/UI/Rodex/UIRodexComposeWnd.cpp
index a0e6e8f8..ae657e74 100644
--- a/Source/UI/Rodex/UIRodexComposeWnd.cpp
+++ b/Source/UI/Rodex/UIRodexComposeWnd.cpp
@@ -60,7 +60,7 @@ struct RodexSendMailRequest {
 
 // OFFSET: 0x007FEF20
 // FUNCTION: fn_09993
-UIRodexEditCtrl3::UIRodexEditCtrl3(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl3(windows, edit) {
+UIRodexEditCtrl3::UIRodexEditCtrl3(UIWindowContext& windows) : UIEditCtrl3(windows) {
 }
 
 // OFFSET: 0x007FEF80
diff --git a/Source/UI/Rodex/UIRodexComposeWnd.h b/Source/UI/Rodex/UIRodexComposeWnd.h
index 2164e13e..f222c757 100644
--- a/Source/UI/Rodex/UIRodexComposeWnd.h
+++ b/Source/UI/Rodex/UIRodexComposeWnd.h
@@ -28,7 +28,7 @@ public:
   // INLINED
   UIRodexEditCtrl3() {
   }
-  UIRodexEditCtrl3(UIWindowContext& windows, UIEditContext& edit);
+  UIRodexEditCtrl3(UIWindowContext& windows);
   void Slot15(int width, int height) override;
   void sub_855150();
 };
diff --git a/Source/UI/UIChangeMaterialWnd.cpp b/Source/UI/UIChangeMaterialWnd.cpp
index 0ec0543d..fd63abd5 100644
--- a/Source/UI/UIChangeMaterialWnd.cpp
+++ b/Source/UI/UIChangeMaterialWnd.cpp
@@ -37,9 +37,9 @@
 
 // OFFSET: 0x005E03B0
 // FUNCTION: fn_03861
-UIChangeMaterialWnd::UIChangeMaterialWnd(UIWindowContext& windows, UIEditContext& edits)
+UIChangeMaterialWnd::UIChangeMaterialWnd(UIWindowContext& windows)
     : UIFrameWnd(windows, 0), m_sortBox(nullptr), m_button(nullptr), m_resultX(168), m_resultY(131), m_resultItem(),
-      m_materialPos{{90, 86}, {246, 86}, {168, 222}, {168, 40}, {90, 176}, {246, 176}}, m_materials(), m_resultAmount(0), m_resultText(), m_editContext(&edits) {
+      m_materialPos{{90, 86}, {246, 86}, {168, 222}, {168, 40}, {90, 176}, {246, 176}}, m_materials(), m_resultAmount(0), m_resultText() {
   *reinterpret_cast<int*>(reinterpret_cast<char*>(this) + 0xB4) = 0;
   *reinterpret_cast<int*>(reinterpret_cast<char*>(this) + 0xB8) = 0;
 }
@@ -707,7 +707,7 @@ void UIChangeMaterialWnd::Slot15(int width, int height) {
   close->SetId(201);
   this->AddChild(close);
 
-  UIEditCtrl* edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  UIEditCtrl* edit = new UIEditCtrl(*this->m_context);
   *reinterpret_cast<UIEditCtrl**>(reinterpret_cast<char*>(this) + 0xB8) = edit;
   edit->SetSize(118, 13);
   edit->Move(313, 262);
diff --git a/Source/UI/UIChangeMaterialWnd.h b/Source/UI/UIChangeMaterialWnd.h
index 15d31bed..098b8423 100644
--- a/Source/UI/UIChangeMaterialWnd.h
+++ b/Source/UI/UIChangeMaterialWnd.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 class UIButton;
-struct UIEditContext;
 
 struct MaterialSlotPos {
   /* 0000 */ int x;
@@ -61,7 +60,7 @@ public:
 
 class UIChangeMaterialWnd : public UIFrameWnd {
 public:
-  UIChangeMaterialWnd(UIWindowContext& windows, UIEditContext& edits);
+  UIChangeMaterialWnd(UIWindowContext& windows);
   void Slot15(int width, int height) override;
   bool Slot02() override;
   void Paint() override;
@@ -85,7 +84,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 class UIChangeMaterialWnd_List : public UIFrameWnd {
diff --git a/Source/UI/UIReputeWnd.cpp b/Source/UI/UIReputeWnd.cpp
index 47dbeb2c..da155e29 100644
--- a/Source/UI/UIReputeWnd.cpp
+++ b/Source/UI/UIReputeWnd.cpp
@@ -63,7 +63,7 @@ void UIReputeWnd::Slot15(int width, int height) {
   this->m_groupCombo->borderBlue = 99;
   this->AddChild(this->m_groupCombo);
 
-  this->m_searchEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_searchEdit = new UIEditCtrl(*this->m_context);
   this->m_searchEdit->SetSize(200, 18);
   this->m_searchEdit->Move(136, 25);
   this->m_searchEdit->maximum = 20;
diff --git a/Source/UI/UIReputeWnd.h b/Source/UI/UIReputeWnd.h
index 10831493..25106b1d 100644
--- a/Source/UI/UIReputeWnd.h
+++ b/Source/UI/UIReputeWnd.h
@@ -13,7 +13,6 @@ class UIBitmapButton;
 class UIComboBoxDefWnd;
 class UIEditCtrl;
 struct UIComboBoxHeaderContext;
-struct UIEditContext;
 
 class UIReputeWnd : public UIFrameWnd {
 public:
@@ -39,7 +38,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
   UIComboBoxHeaderContext* m_comboContext;
 };
 
diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.cpp b/Source/UI/Window/UIAccountLimitedToolWnd.cpp
index c79052cf..26e6d7d3 100644
--- a/Source/UI/Window/UIAccountLimitedToolWnd.cpp
+++ b/Source/UI/Window/UIAccountLimitedToolWnd.cpp
@@ -58,7 +58,7 @@ void UIAccountLimitedToolWnd::Slot15(int, int) {
     {125, 121}, {160, 121}, {268, 121}, {305, 121}, {90, 151}, {240, 151}, {285, 151},
   };
   for (int i = 0; i < 15; ++i) {
-    this->m_edits[i] = new UIEditCtrl(*this->m_context, *this->m_editContext);
+    this->m_edits[i] = new UIEditCtrl(*this->m_context);
     this->m_edits[i]->flat = 1;
     this->m_edits[i]->disabled = 1;
     this->m_edits[i]->Invalidate();
@@ -366,8 +366,8 @@ int UIAccountLimitedToolWnd::SendMsg(UIWindow* sender, int message, std::intptr_
 
 // OFFSET: 0x00946800
 // FUNCTION: fn_12846
-UIAccountLimitedToolWnd::UIAccountLimitedToolWnd(UIWindowContext& windows, UIEditContext& edits, UITextViewerContext& texts)
-    : UIFrameWnd(windows, 0), m_accountIdText(nullptr), m_viewer(nullptr), m_editContext(&edits), m_textContext(&texts) {
+UIAccountLimitedToolWnd::UIAccountLimitedToolWnd(UIWindowContext& windows, UITextViewerContext& texts)
+    : UIFrameWnd(windows, 0), m_accountIdText(nullptr), m_viewer(nullptr), m_textContext(&texts) {
   SecureZeroMemory(this->m_edits, sizeof(this->m_edits));
   SecureZeroMemory(this->m_buttons, sizeof(this->m_buttons));
 }
diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.h b/Source/UI/Window/UIAccountLimitedToolWnd.h
index 68c53201..90d914b0 100644
--- a/Source/UI/Window/UIAccountLimitedToolWnd.h
+++ b/Source/UI/Window/UIAccountLimitedToolWnd.h
@@ -5,7 +5,6 @@
 
 #include <string>
 
-struct UIEditContext;
 struct UITextViewerContext;
 class UIBitmapButton;
 class UIEditCtrl;
@@ -14,7 +13,7 @@ class UITextViewer;
 
 class UIAccountLimitedToolWnd : public UIFrameWnd {
 public:
-  UIAccountLimitedToolWnd(UIWindowContext& windows, UIEditContext& edits, UITextViewerContext& texts);
+  UIAccountLimitedToolWnd(UIWindowContext& windows, UITextViewerContext& texts);
   void Slot15(int width, int height) override;
   void Paint() override;
   int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override;
@@ -27,7 +26,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
   UITextViewerContext* m_textContext;
 };
 
diff --git a/Source/UI/Window/UIBank_NewWnd.h b/Source/UI/Window/UIBank_NewWnd.h
index 32f57d7e..2ceef025 100644
--- a/Source/UI/Window/UIBank_NewWnd.h
+++ b/Source/UI/Window/UIBank_NewWnd.h
@@ -4,11 +4,10 @@
 #include "UI/Window/UIFrameWnd.h"
 
 class UIEditCtrl;
-struct UIEditContext;
 
 class UIBank_NewWnd : public UIFrameWnd {
 public:
-  UIBank_NewWnd(UIWindowContext& windows, UIEditContext& editContext);
+  UIBank_NewWnd(UIWindowContext& windows);
   bool Slot03() override;
   void Slot15(int width, int height) override;
   long long AdjustAmount(int amount);
@@ -24,7 +23,6 @@ protected:
   /* 00D0 */ int unknown_00D0;
   /* 00D4 */ UIWindow* m_loading[4];
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Window/UIChatRoomWnd.h b/Source/UI/Window/UIChatRoomWnd.h
index 379da002..773ae5bf 100644
--- a/Source/UI/Window/UIChatRoomWnd.h
+++ b/Source/UI/Window/UIChatRoomWnd.h
@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>
 
-struct UIEditContext;
 class UIBitmapButton;
 class UIChatEditCtrl;
 class UIChatHisBox;
@@ -51,7 +50,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
   void* unknown_listContext;
 };
 
diff --git a/Source/UI/Window/UICntWnd.h b/Source/UI/Window/UICntWnd.h
index 91d61bab..154a221a 100644
--- a/Source/UI/Window/UICntWnd.h
+++ b/Source/UI/Window/UICntWnd.h
@@ -5,11 +5,10 @@
 
 class UIEditCtrl;
 class UIStaticText;
-struct UIEditContext;
 
 class UICntWnd : public UIFrameWnd {
 public:
-  UICntWnd(UIWindowContext& windows, UIEditContext& editContext);
+  UICntWnd(UIWindowContext& windows);
   ~UICntWnd() override;
 
   void Slot15(int width, int height) override;
@@ -21,7 +20,6 @@ protected:
   /* 00B8 */ UIEditCtrl* m_edit;
   /* 00BC */ UIStaticText* m_text;
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp
index 4226f42e..148dfe3a 100644
--- a/Source/UI/Window/UIFrameWnd.cpp
+++ b/Source/UI/Window/UIFrameWnd.cpp
@@ -616,8 +616,8 @@ UIAllyGuildAcceptWnd::UIAllyGuildAcceptWnd(UIWindowContext& windows, UIAcceptanc
 
 // OFFSET: 0x008A3510
 // FUNCTION: fn_11654
-UIBank_NewWnd::UIBank_NewWnd(UIWindowContext& windows, UIEditContext& editContext)
-    : UIFrameWnd(windows, 0), m_amountEdit(nullptr), m_status(), m_editContext(&editContext) {
+UIBank_NewWnd::UIBank_NewWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0), m_amountEdit(nullptr), m_status() {
 }
 
 // OFFSET: 0x008A35A0
@@ -1091,8 +1091,8 @@ int UIChatRoomWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::
 
 // OFFSET: 0x008A36A0
 // FUNCTION: fn_11656
-UICntWnd::UICntWnd(UIWindowContext& windows, UIEditContext& editContext)
-    : UIFrameWnd(windows, 0), m_editContext(&editContext) {
+UICntWnd::UICntWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
 }
 
 // OFFSET: 0x008A37F0
diff --git a/Source/UI/Window/UIHomunInfoWnd.h b/Source/UI/Window/UIHomunInfoWnd.h
index 46cef196..e1ebb678 100644
--- a/Source/UI/Window/UIHomunInfoWnd.h
+++ b/Source/UI/Window/UIHomunInfoWnd.h
@@ -13,7 +13,6 @@ class UIINT64BarGraph;
 class UINormalMB;
 class ForbiddenWords;
 struct WindowResponseRecorder;
-struct UIEditContext;
 
 class UIHomunInfoWnd : public UIFrameWnd {
 public:
@@ -35,7 +34,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
   WindowResponseRecorder* m_recorder;
   ForbiddenWords* m_forbiddenWords;
 };
diff --git a/Source/UI/Window/UILoginOTPWnd.h b/Source/UI/Window/UILoginOTPWnd.h
index a1bfe247..679bc132 100644
--- a/Source/UI/Window/UILoginOTPWnd.h
+++ b/Source/UI/Window/UILoginOTPWnd.h
@@ -3,7 +3,6 @@
 
 #include "UI/Window/UIFrameWnd.h"
 
-struct UIEditContext;
 class UIEditCtrl;
 class UIStaticText;
 
@@ -23,7 +22,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp
index 9ddfc41c..b89f7888 100644
--- a/Source/UI/Window/UIMessageBox.cpp
+++ b/Source/UI/Window/UIMessageBox.cpp
@@ -1022,7 +1022,7 @@ void UILoginOTPWnd::Slot15(int, int) {
   thread_local EncryptedName<sizeof(prefixSource), 0x793F370985ED674FULL> prefixName(prefixSource);
   const std::string prefix(prefixName.Text());
 
-  this->unknown_00B4 = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->unknown_00B4 = new UIEditCtrl(*this->m_context);
   this->unknown_00B4->SetSize(80, 16);
   this->unknown_00B4->maximum = 8;
   this->unknown_00B4->Move(99, 95);
@@ -1620,7 +1620,7 @@ void UIChatRoomWnd::Slot15(int, int) {
   this->resizer->SetColors(0xFFFF00FF, 0xFFFF00FF);
   this->AddChild(this->resizer);
 
-  this->edit = new UIChatEditCtrl(*this->m_context, *this->m_editContext);
+  this->edit = new UIChatEditCtrl(*this->m_context);
   this->edit->SetSize(this->geometry.width - 30, 16);
   this->edit->Move(3, this->geometry.height - 18);
   this->edit->maximum = 70;
@@ -1905,7 +1905,7 @@ void UIReplayRECControlWnd::Slot15(int, int) {
   this->fileOptions[1]->SetChecked(option119);
   this->replayOption119 = option119;
 
-  UIEditCtrl* edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  UIEditCtrl* edit = new UIEditCtrl(*this->m_context);
   this->window_0134 = edit;
   edit->SetSize(151, 18);
   edit->Move(-100, -100);
@@ -1973,7 +1973,7 @@ void UISelectReplayDataWnd::Slot15(int width, int height) {
 // OFFSET: 0x008B7040
 // FUNCTION: fn_11752
 void UITalkboxTrapInputWnd::Slot15(int, int) {
-  this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->edit = new UIEditCtrl(*this->m_context);
   this->edit->SetSize(240, 16);
   this->edit->Move(22, 50);
   this->edit->maximum = 78;
@@ -2624,7 +2624,7 @@ void UIBank_NewWnd::Slot15(int, int) {
   this->AddBitmapButton(390, 93, 132, "bank\\btn_1000mil", "+ 10,000,000");
   this->AddBitmapButton(389, 45, 132, "bank\\btn_max", LookupMessage(2778));
 
-  this->m_amountEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_amountEdit = new UIEditCtrl(*this->m_context);
   this->m_amountEdit->SetSize(99, 17);
   this->m_amountEdit->maximum = 10;
   this->m_amountEdit->Move(78, 90);
@@ -2639,7 +2639,7 @@ void UIBank_NewWnd::Slot15(int, int) {
 // OFFSET: 0x008AD770
 // FUNCTION: fn_11739
 void UICntWnd::Slot15(int, int) {
-  this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edit = new UIEditCtrl(*this->m_context);
   this->m_edit->SetSize(80, 16);
   this->m_edit->Move(15, 22);
   this->m_edit->maximum = 6;
@@ -3196,8 +3196,8 @@ UISelectServerWnd::UISelectServerWnd(UIWindowContext& windows)
 
 // OFFSET: 0x008A46E0
 // FUNCTION: fn_11673
-UITalkboxTrapInputWnd::UITalkboxTrapInputWnd(UIWindowContext& windows, UIEditContext& editContext)
-    : UIFrameWnd(windows, 0), m_editContext(&editContext) {
+UITalkboxTrapInputWnd::UITalkboxTrapInputWnd(UIWindowContext& windows)
+    : UIFrameWnd(windows, 0) {
 }
 
 // OFFSET: 0x008A4E00
@@ -3379,7 +3379,7 @@ int UILoginOTPWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::
 // FUNCTION: fn_11740
 void UIHomunInfoWnd::Slot15(int, int) {
   this->AddCloseButton("", 0);
-  this->nameEdit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
+  this->nameEdit = new UIEditCtrl2(*this->m_context);
   this->nameEdit->SetSize(80, 16);
   char* const name = reinterpret_cast<char*>(&g_session.unknown_5570[0x0C]);
   if (std::strcmp(name, "") == 0) {
@@ -3646,7 +3646,7 @@ int UIHomunInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:
 // FUNCTION: fn_11747
 void UIPetInfoWnd::Slot15(int, int) {
   this->AddCloseButton("", 0);
-  this->nameEdit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
+  this->nameEdit = new UIEditCtrl2(*this->m_context);
   this->nameEdit->SetSize(80, 16);
   if (std::strcmp(g_session.unknown_1018, "") == 0) {
     std::sprintf(g_session.unknown_1018, g_session.GetJobName(g_session.unknown_103C, -1));
diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp
index 22ff547a..4d5f866a 100644
--- a/Source/UI/Window/UINavigationWnd.cpp
+++ b/Source/UI/Window/UINavigationWnd.cpp
@@ -168,7 +168,7 @@ void UINavigationWnd::Slot15(int width, int height) {
   this->unknown_00EC->AddOption(LookupMessage(0x8A0), 0);
   this->unknown_00EC->AddOption(LookupMessage(0x8A1), 0);
 
-  this->m_titleBar = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_titleBar = new UIEditCtrl(*this->m_context);
   this->m_titleBar->SetSize(226, 18);
   this->m_titleBar->Move(-1000, -1000);
   this->m_titleBar->maximum = 60;
diff --git a/Source/UI/Window/UINavigationWnd.h b/Source/UI/Window/UINavigationWnd.h
index 81396020..f358f9d2 100644
--- a/Source/UI/Window/UINavigationWnd.h
+++ b/Source/UI/Window/UINavigationWnd.h
@@ -18,7 +18,6 @@ class UIEditCtrl;
 class UIListBoxNavi;
 class UIResizer;
 struct UIComboBoxHeaderContext;
-struct UIEditContext;
 struct WindowDialogs;
 struct WindowResponseRecorder;
 
@@ -94,7 +93,6 @@ protected:
   void* unknown_controls;
   void* unknown_listContext;
   UIComboBoxHeaderContext* m_comboContext;
-  UIEditContext* m_editContext;
   WindowResponseRecorder* m_recorder;
   WindowDialogs* m_dialogs;
 };
diff --git a/Source/UI/Window/UINewMakeCharWnd.cpp b/Source/UI/Window/UINewMakeCharWnd.cpp
index 359df122..277e1c91 100644
--- a/Source/UI/Window/UINewMakeCharWnd.cpp
+++ b/Source/UI/Window/UINewMakeCharWnd.cpp
@@ -377,7 +377,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) {
   cancelButton->SetId(0xB9);
   this->AddChild(cancelButton);
 
-  this->m_nameEdit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
+  this->m_nameEdit = new UIEditCtrl2(*this->m_context);
   this->m_nameEdit->SetSize(0x82, 0x14);
   this->m_nameEdit->Move(0x1B3, 0x10C);
   this->m_nameEdit->maximum = 0x17;
diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Window/UINewMakeCharWnd.h
index 2d20ef0f..b33364dc 100644
--- a/Source/UI/Window/UINewMakeCharWnd.h
+++ b/Source/UI/Window/UINewMakeCharWnd.h
@@ -135,7 +135,6 @@ public:
   /* 0364 */ int unknown_0364;
   /* 0368 */ int unknown_0368;
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #if defined(_WIN32) && !defined(_WIN64)
diff --git a/Source/UI/Window/UIPetInfoWnd.h b/Source/UI/Window/UIPetInfoWnd.h
index da9ccae1..9e9ced60 100644
--- a/Source/UI/Window/UIPetInfoWnd.h
+++ b/Source/UI/Window/UIPetInfoWnd.h
@@ -13,7 +13,6 @@ class UINormalMB;
 class ForbiddenWords;
 class UINoneVisibleButton;
 class UIPetInfoBarGraph;
-struct UIEditContext;
 struct WindowResponseRecorder;
 
 class UIPetInfoWnd : public UIFrameWnd {
@@ -39,7 +38,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
   WindowResponseRecorder* m_recorder;
   ForbiddenWords* m_forbiddenWords;
 };
diff --git a/Source/UI/Window/UIReplayRECControlWnd.h b/Source/UI/Window/UIReplayRECControlWnd.h
index 96795b5d..3ee5b578 100644
--- a/Source/UI/Window/UIReplayRECControlWnd.h
+++ b/Source/UI/Window/UIReplayRECControlWnd.h
@@ -12,7 +12,6 @@ class UICheckBox;
 class UIEditCtrl;
 class UIStaticBitmap;
 class UIStaticText;
-struct UIEditContext;
 
 class UIReplayRECControlWnd : public UIFrameWnd {
 public:
@@ -68,7 +67,6 @@ public:
 protected:
   void* unknown_focus;
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Window/UIRodexContentsWnd.cpp
index 847520e6..a7f4a67a 100644
--- a/Source/UI/Window/UIRodexContentsWnd.cpp
+++ b/Source/UI/Window/UIRodexContentsWnd.cpp
@@ -358,7 +358,7 @@ void UIRodexContentsWnd::SetMailContents(std::string title, std::string sender,
   this->m_sender = g_navigationLinkParser->ExpandMessages(this->m_sender);
   text = g_navigationLinkParser->ExpandMessages(text);
 
-  this->m_contents = new UIRodexEditCtrl3(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
+  this->m_contents = new UIRodexEditCtrl3(*this->m_context);
   this->m_contents->SetSize(267, 192);
   this->m_contents->invalidatesParent = 1;
   this->m_contents->Move(15, 81);
diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Window/UISeekPartyListWnd.cpp
index 1c27747e..e4d0205c 100644
--- a/Source/UI/Window/UISeekPartyListWnd.cpp
+++ b/Source/UI/Window/UISeekPartyListWnd.cpp
@@ -65,7 +65,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) {
   this->m_levelLabel->shadow = 1;
   this->AddChild(this->m_levelLabel);
 
-  this->m_searchEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_searchEdit = new UIEditCtrl(*this->m_context);
   this->m_searchEdit->SetSize(0x28, 0x10);
   this->m_searchEdit->Move(0x32, 0x14);
   this->m_searchEdit->maximum = 5;
diff --git a/Source/UI/Window/UISeekPartyListWnd.h b/Source/UI/Window/UISeekPartyListWnd.h
index 607fdfab..2a8af90b 100644
--- a/Source/UI/Window/UISeekPartyListWnd.h
+++ b/Source/UI/Window/UISeekPartyListWnd.h
@@ -18,7 +18,6 @@ class UIStaticText;
 class UITextButton;
 struct SeekPartyListWndInfo;
 struct UIComboBoxHeaderContext;
-struct UIEditContext;
 
 extern std::map<int, PartyBookingEntry> g_friendRows;
 
@@ -92,7 +91,6 @@ protected:
   /* 01D0 */ SeekPartyListWndInfo* m_saved;
   UIStaticText* m_footerText;
   void* unknown_controls;
-  UIEditContext* m_editContext;
   UIComboBoxHeaderContext* m_comboContext;
 };
 
diff --git a/Source/UI/Window/UISeekPartyMBWnd.cpp b/Source/UI/Window/UISeekPartyMBWnd.cpp
index c06181af..b6095092 100644
--- a/Source/UI/Window/UISeekPartyMBWnd.cpp
+++ b/Source/UI/Window/UISeekPartyMBWnd.cpp
@@ -330,7 +330,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) {
 
   this->CreateJobChecks();
 
-  this->m_levelEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_levelEdit = new UIEditCtrl(*this->m_context);
   this->m_levelEdit->SetSize(0x28, 0x10);
   this->m_levelEdit->Move(0x32, 0x14);
   this->m_levelEdit->maximum = 5;
diff --git a/Source/UI/Window/UISeekPartyMBWnd.h b/Source/UI/Window/UISeekPartyMBWnd.h
index def91c7f..e065dc7e 100644
--- a/Source/UI/Window/UISeekPartyMBWnd.h
+++ b/Source/UI/Window/UISeekPartyMBWnd.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 struct UIComboBoxHeaderContext;
-struct UIEditContext;
 struct SeekPartyMBWndInfo;
 class UIBitmapButton;
 class UICheckBox;
@@ -60,7 +59,6 @@ protected:
   void* unknown_controls;
   UIStaticText* m_titleText;
   UIStaticText* m_levelText;
-  UIEditContext* m_editContext;
   UIComboBoxHeaderContext* m_comboContext;
 };
 
diff --git a/Source/UI/Window/UISerachStoreInfoWnd.cpp b/Source/UI/Window/UISerachStoreInfoWnd.cpp
index 17e54bd9..a4522f28 100644
--- a/Source/UI/Window/UISerachStoreInfoWnd.cpp
+++ b/Source/UI/Window/UISerachStoreInfoWnd.cpp
@@ -97,7 +97,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
   this->m_radios[1]->SetText(LookupMessage(0x6F3));
   this->m_radios[this->unknown_00E4]->SendMsg(this, 0xD, 1, 0, 0, 0);
 
-  this->m_edits[1] = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edits[1] = new UIEditCtrl(*this->m_context);
   this->m_edits[1]->SetSize(0x4C, 0x10);
   this->m_edits[1]->Move(100, 0x24);
   this->m_edits[1]->maximum = 0x32;
@@ -106,7 +106,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
   this->m_edits[1]->flat = 0;
   this->AddChild(this->m_edits[1]);
 
-  this->m_edits[0] = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edits[0] = new UIEditCtrl(*this->m_context);
   this->m_edits[0]->SetSize(0x4C, 0x10);
   this->m_edits[0]->Move(0xBB, 0x24);
   this->m_edits[0]->maximum = 0x32;
@@ -122,7 +122,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
   this->m_edits[0]->invalidatesParent = 1;
   this->AddChild(this->m_edits[0]);
 
-  this->m_edits[2] = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edits[2] = new UIEditCtrl(*this->m_context);
   this->m_edits[2]->SetSize(0x4C, 0x10);
   this->m_edits[2]->Move(0x113, 0x24);
   this->m_edits[2]->maximum = 0x32;
@@ -133,7 +133,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
   this->m_edits[2]->Invalidate();
   this->AddChild(this->m_edits[2]);
 
-  this->m_edits[3] = new UIEditCtrl(*this->m_context, *this->m_editContext);
+  this->m_edits[3] = new UIEditCtrl(*this->m_context);
   this->m_edits[3]->SetSize(0x4C, 0x10);
   this->m_edits[3]->Move(0x16C, 0x24);
   this->m_edits[3]->maximum = 0x32;
diff --git a/Source/UI/Window/UISerachStoreInfoWnd.h b/Source/UI/Window/UISerachStoreInfoWnd.h
index 81bffba9..de1a2c88 100644
--- a/Source/UI/Window/UISerachStoreInfoWnd.h
+++ b/Source/UI/Window/UISerachStoreInfoWnd.h
@@ -9,7 +9,6 @@ class UIBitmapButton;
 class UIEditCtrl;
 class UIRadioBtn;
 class UITextButton;
-struct UIEditContext;
 
 class UISerachStoreInfoWnd : public UIFrameWnd {
 public:
@@ -38,7 +37,6 @@ protected:
   /* 00F0 */ std::string unknown_00F0;
 
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Window/UITalkboxTrapInputWnd.h b/Source/UI/Window/UITalkboxTrapInputWnd.h
index 34a8d72a..402fd060 100644
--- a/Source/UI/Window/UITalkboxTrapInputWnd.h
+++ b/Source/UI/Window/UITalkboxTrapInputWnd.h
@@ -4,7 +4,6 @@
 #include "UI/Window/UIFrameWnd.h"
 
 class UIEditCtrl;
-struct UIEditContext;
 
 struct TalkboxTrapTarget {
   /* 0000 */ int unknown_0000;
@@ -20,7 +19,7 @@ struct TalkboxTrapRequest {
 
 class UITalkboxTrapInputWnd : public UIFrameWnd {
 public:
-  UITalkboxTrapInputWnd(UIWindowContext& windows, UIEditContext& editContext);
+  UITalkboxTrapInputWnd(UIWindowContext& windows);
 
   void Slot15(int width, int height) override;
   void Paint() override;
@@ -31,7 +30,6 @@ public:
 
 protected:
   void* unknown_controls;
-  UIEditContext* m_editContext;
 };
 
 #endif
diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp
index ba508477..78ccbdfc 100644
--- a/Source/UI/Window/WindowMgrState.cpp
+++ b/Source/UI/Window/WindowMgrState.cpp
@@ -1168,7 +1168,7 @@ int WindowDialogs::RunEmailAddress() {
   }
 
   auto* window = new UIEmailAddressWnd(
-    this->windows, *reinterpret_cast<UIEditContext*>(nullptr)
+    this->windows
   );
   window->SetSize(280, 48);
   window->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180);