diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp
index 407223611..9537b5b4a 100644
--- a/Source/Client/Mode/GameMode.cpp
+++ b/Source/Client/Mode/GameMode.cpp
@@ -1,7 +1,6 @@
 #include "Client/Mode/CGameMode.h"
 #include "Client/Mode/ModeMgr.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Session.h"
 #include "Contents/Actors/Npc.h"
 #include "Contents/Actors/Pc.h"
@@ -419,23 +418,7 @@ void CGameMode::sub_CEB8E0() {
   std::memcpy(record.buffer + record.firstLength, this->unknown_03E0.data(), record.secondLength);
   record.length = static_cast<std::int16_t>(offsetof(GameModeTextRecord, buffer) + record.firstLength + record.secondLength);
 
-  Replay& replay = Replay::Instance();
-  ReplayPacketRecorder recorder = {
-    g_packetLengths,
-    replay.baseFrame,
-    replay.started,
-    replay.frame,
-    replay.header.key0,
-    replay.header.key1,
-    replay.header.options.recordRestricted,
-    replay.file,
-    replay.fileOffset,
-    replay.records,
-    replay.cipherIndex,
-    replay.cipherBase,
-    replay.cipherKey,
-  };
-  recorder.Record(static_cast<std::uint16_t>(record.length), &record, 0x2A, 0);
+  Replay::Instance().Record(static_cast<std::uint16_t>(record.length), &record, 0x2A, 0);
 }
 
 // OFFSET: 0x00CEBF30
@@ -861,23 +844,7 @@ void __stdcall sub_CE8F10(const void* info, const unsigned char* data) {
   std::memcpy(&packet.info, info, sizeof(packet.info));
   std::memcpy(packet.data, data, sizeof(packet.data));
 
-  Replay& replay = Replay::Instance();
-  ReplayPacketRecorder recorder = {
-    g_packetLengths,
-    replay.baseFrame,
-    replay.started,
-    replay.frame,
-    replay.header.key0,
-    replay.header.key1,
-    replay.header.options.recordRestricted,
-    replay.file,
-    replay.fileOffset,
-    replay.records,
-    replay.cipherIndex,
-    replay.cipherBase,
-    replay.cipherKey,
-  };
-  recorder.Record(packet.length, &packet, 0x2A, 0);
+  Replay::Instance().Record(packet.length, &packet, 0x2A, 0);
 }
 
 // OFFSET: 0x00CDFAF0
@@ -924,23 +891,7 @@ bool CGameMode::RecordReplayMessage(int message, int value, int first, int secon
   record.first = first;
   record.second = second;
 
-  Replay& replay = Replay::Instance();
-  ReplayPacketRecorder recorder = {
-    g_packetLengths,
-    replay.baseFrame,
-    replay.started,
-    replay.frame,
-    replay.header.key0,
-    replay.header.key1,
-    replay.header.options.recordRestricted,
-    replay.file,
-    replay.fileOffset,
-    replay.records,
-    replay.cipherIndex,
-    replay.cipherBase,
-    replay.cipherKey,
-  };
-  recorder.Record(record.length, &record, 0x2A, 0);
+  Replay::Instance().Record(record.length, &record, 0x2A, 0);
   return true;
 }
 
diff --git a/Source/Client/Replay.h b/Source/Client/Replay.h
index 45f155195..ca2cd0f2f 100644
--- a/Source/Client/Replay.h
+++ b/Source/Client/Replay.h
@@ -118,6 +118,7 @@ public:
     }
   }
 
+  bool Record(std::uint16_t bytes, const void* packet, int event, std::uint32_t delay);
   bool WriteSection(int id, std::vector<unsigned char>& bytes, int event);
   int WriteHeader(int event);
   std::vector<unsigned char> BuildMetadata();
diff --git a/Source/Client/ReplayPacketRecorder.cpp b/Source/Client/ReplayPacketRecorder.cpp
index d7daa73cc..200e23c49 100644
--- a/Source/Client/ReplayPacketRecorder.cpp
+++ b/Source/Client/ReplayPacketRecorder.cpp
@@ -1,6 +1,5 @@
 #include "Client/Mode/ModeDragState.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Session.h"
 #include "Network/Packets/PacketLengths.h"
 #include "Network/Packets/PacketId.h"
@@ -16,7 +15,7 @@
 
 // OFFSET: 0x00B86880
 // FUNCTION: fn_19332
-bool ReplayPacketRecorder::Record(std::uint16_t bytes, const void* packet, int event, std::uint32_t delay) {
+bool Replay::Record(std::uint16_t bytes, const void* packet, int event, std::uint32_t delay) {
   if (bytes == 0 || !packet) {
     return false;
   }
@@ -25,7 +24,7 @@ bool ReplayPacketRecorder::Record(std::uint16_t bytes, const void* packet, int e
   std::memcpy(&id, packet, sizeof(id));
 
   if (id != ID_REPLAY_WINDOW_RESPONSE) {
-    if (this->lengths.IsRecorded(id) == 0) {
+    if (g_packetLengths.IsRecorded(id) == 0) {
       return false;
     }
 
@@ -37,7 +36,7 @@ bool ReplayPacketRecorder::Record(std::uint16_t bytes, const void* packet, int e
     case ID_ZC_GUILD_CHAT:
     case ID_ZC_BATTLEFIELD_CHAT:
     case ID_ZC_ALLY_CHAT:
-      if (this->recordRestricted == 0) {
+      if (this->header.options.recordRestricted == 0) {
         return false;
       }
 
@@ -58,9 +57,9 @@ bool ReplayPacketRecorder::Record(std::uint16_t bytes, const void* packet, int e
   }
 
   std::memcpy(record.data() + 10, packet, bytes);
-  this->cipherKey = this->key1 >> 3;
+  this->cipherKey = this->header.key1 >> 3;
   this->cipherIndex = 0;
-  this->cipherBase = this->key0 >> 5;
+  this->cipherBase = this->header.key0 >> 5;
 
   for (unsigned index = 0; index < bytes / 4u; ++index) {
     std::uint32_t word;
@@ -95,7 +94,7 @@ void UIWindow::RecordResponse(int response, std::intptr_t b, std::intptr_t c, st
 #pragma pack(pop)
   static_assert(sizeof(Response) == 26);
   const Response packet{0x038408AEu, 26, this->geometry.id, response, {static_cast<std::uint32_t>(b), static_cast<std::uint32_t>(c), static_cast<std::uint32_t>(d)}};
-  reinterpret_cast<ReplayPacketRecorder*>(&Replay::Instance())->Record(sizeof(packet), &packet, 42, 0);
+  Replay::Instance().Record(sizeof(packet), &packet, 42, 0);
 }
 
 // OFFSET: 0x00B86AB0
@@ -306,7 +305,7 @@ void UIWindow::RecordDrop(int x, int y, const ModeDragState& drag, int target) {
   packet.optionCount = drag.optionCount;
   std::memcpy(packet.options, drag.options, sizeof(packet.options));
 
-  reinterpret_cast<ReplayPacketRecorder*>(&Replay::Instance())->Record(packet.bytes, &packet, 42, 0);
+  Replay::Instance().Record(packet.bytes, &packet, 42, 0);
 }
 
 // OFFSET: 0x00A83180
@@ -344,7 +343,7 @@ void UIWindow::RecordValues(int value, int argument1, int argument2, int argumen
   packet.arguments[1] = argument2;
   packet.arguments[2] = argument3;
   packet.arguments[3] = argument4;
-  reinterpret_cast<ReplayPacketRecorder*>(&Replay::Instance())->Record(packet.bytes, &packet, 42, 0);
+  Replay::Instance().Record(packet.bytes, &packet, 42, 0);
 }
 
 // OFFSET: 0x00A83440
@@ -361,5 +360,5 @@ void UIWindow::RecordText(int event, const char* text) {
   packet.windowId = this->geometry.id;
   packet.event = event;
   std::memcpy(packet.text, text, std::min(static_cast<int>(std::strlen(text)), 100));
-  reinterpret_cast<ReplayPacketRecorder*>(&Replay::Instance())->Record(packet.bytes, &packet, 42, 0);
+  Replay::Instance().Record(packet.bytes, &packet, 42, 0);
 }
diff --git a/Source/Client/ReplayPacketRecorder.h b/Source/Client/ReplayPacketRecorder.h
deleted file mode 100644
index 92cfc64c3..000000000
--- a/Source/Client/ReplayPacketRecorder.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef RAGNAROK_SOURCE_CLIENT_REPLAYPACKETRECORDER_H
-#define RAGNAROK_SOURCE_CLIENT_REPLAYPACKETRECORDER_H
-#include "Client/ReplayRecordOption.h"
-
-#include <cstdint>
-#include <cstdio>
-#include <vector>
-
-class PacketLengths;
-struct ModeDragState;
-
-struct ReplayPacketRecorder {
-  const PacketLengths& lengths;
-  const std::uint32_t& baseFrame;
-  const std::uint32_t& started;
-  const std::uint32_t& frame;
-  const std::uint32_t& key0;
-  const std::uint32_t& key1;
-  const unsigned char& recordRestricted;
-  std::FILE*& file;
-  std::uint32_t& fileOffset;
-  std::uint32_t& records;
-  std::uint32_t& cipherIndex;
-  std::uint32_t& cipherBase;
-  std::uint32_t& cipherKey;
-
-  bool Record(std::uint16_t bytes, const void* packet, int event, std::uint32_t delay);
-};
-
-
-#endif
diff --git a/Source/Contents/NavigationRoute.cpp b/Source/Contents/NavigationRoute.cpp
index 99694e477..354deb9a3 100644
--- a/Source/Contents/NavigationRoute.cpp
+++ b/Source/Contents/NavigationRoute.cpp
@@ -4,7 +4,6 @@
 #include "Utility/Text/FormatString.h"
 #include "Client/Registry.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Session.h"
 #include "Resource/ResourceMgr.h"
 #include "Network/Connection/Connection.h"
@@ -709,23 +708,7 @@ bool CNavigationManager::sub_B99030(std::string name, int type, unsigned char mo
       record.id = id;
       std::memcpy(packet, &record, sizeof(record));
 
-      Replay& replay = Replay::Instance();
-      ReplayPacketRecorder recorder = {
-        g_packetLengths,
-        replay.baseFrame,
-        replay.started,
-        replay.frame,
-        replay.header.key0,
-        replay.header.key1,
-        replay.header.options.recordRestricted,
-        replay.file,
-        replay.fileOffset,
-        replay.records,
-        replay.cipherIndex,
-        replay.cipherBase,
-        replay.cipherKey,
-      };
-      recorder.Record(static_cast<std::uint16_t>(record.length), packet, 0x29, 0);
+      Replay::Instance().Record(static_cast<std::uint16_t>(record.length), packet, 0x29, 0);
     }
   }
   return true;
@@ -1330,23 +1313,7 @@ bool CNavigationManager::SetDestinationMap(std::string mapName, int x, int y) {
       record.y = y;
       std::memcpy(packet, &record, sizeof(record));
 
-      Replay& replay = Replay::Instance();
-      ReplayPacketRecorder recorder = {
-        g_packetLengths,
-        replay.baseFrame,
-        replay.started,
-        replay.frame,
-        replay.header.key0,
-        replay.header.key1,
-        replay.header.options.recordRestricted,
-        replay.file,
-        replay.fileOffset,
-        replay.records,
-        replay.cipherIndex,
-        replay.cipherBase,
-        replay.cipherKey,
-      };
-      recorder.Record(static_cast<std::uint16_t>(record.length), packet, 0x29, 0);
+      Replay::Instance().Record(static_cast<std::uint16_t>(record.length), packet, 0x29, 0);
     }
   }
 
diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
index 289b8f633..d98dd9c93 100644
--- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
+++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
@@ -35,7 +35,6 @@
 #include "Client/Mode/ModeEvents.h"
 #include "Client/Mode/ModeDragState.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Render/DeviceContext/DeviceContext.h"
 #include "Render/Renderer.h"
 #include "Render/Textures/SpriteAtlas.h"
diff --git a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp
index ea916bd3b..b22a44afb 100644
--- a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp
+++ b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp
@@ -5,7 +5,7 @@
 #include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/MessageTable.h"
 #include "Client/Mode/ModeEvents.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Contents/UserData/NormalItemSlots.h"
 #include "File/ShortcutFilename.h"
 #include "UI/Buttons/UIButton.h"
diff --git a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp
index 98a2173dc..8ebc09542 100644
--- a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp
+++ b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp
@@ -1,7 +1,7 @@
 #include "Client/Mode/CMode.h"
 #include "Contents/MessageTable.h"
 #include "Client/Mode/ModeEvents.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "UI/Buttons/UIButton.h"
 #include "UI/Acceptance/UIJoinPartyAcceptWnd.h"
 #include "UI/Text/UITextViewer.h"
diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp
index 54b79dca1..ec895e1f7 100644
--- a/Source/UI/Edit/UIEditCtrl.cpp
+++ b/Source/UI/Edit/UIEditCtrl.cpp
@@ -2,7 +2,6 @@
 #include "Client/Input/InputCharset.h"
 #include "Client/Input/Language.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "File/File.h"
 #include "Network/TextEncoding.h"
 #include "Render/DeviceContext/DeviceContext.h"
diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp
index d12e9601e..c71d2933f 100644
--- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp
+++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp
@@ -2,7 +2,7 @@
 
 #include "Client/Mode/CGameMode.h"
 #include "Client/Mode/ModeMgr.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Client/Session.h"
 #include "Contents/GuildInfo.h"
 #include "Contents/GuildMgr.h"
diff --git a/Source/UI/Guild/UIAgitWnd.cpp b/Source/UI/Guild/UIAgitWnd.cpp
index a1de7f52a..ae7ef82c9 100644
--- a/Source/UI/Guild/UIAgitWnd.cpp
+++ b/Source/UI/Guild/UIAgitWnd.cpp
@@ -1,7 +1,7 @@
 #include "UI/Guild/UIAgitWnd.h"
 #include "Client/Mode/CMode.h"
 #include "Client/Mode/ModeMgr.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Client/Session.h"
 #include "Contents/GuildInfo.h"
 #include "Contents/GuildMgr.h"
diff --git a/Source/UI/Item/UIParaItemShopWnd.cpp b/Source/UI/Item/UIParaItemShopWnd.cpp
index aee9bf2ca..9998cb888 100644
--- a/Source/UI/Item/UIParaItemShopWnd.cpp
+++ b/Source/UI/Item/UIParaItemShopWnd.cpp
@@ -8,7 +8,6 @@
 #include "Client/Mode/ModeDragState.h"
 #include "Client/Mode/ModeMgr.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Session.h"
 #include "Contents/ClientItemLists.h"
 #include "Contents/Configuration/ServiceConfiguration.h"
diff --git a/Source/UI/Items/UIItemRepairWnd.cpp b/Source/UI/Items/UIItemRepairWnd.cpp
index e701622f8..94c724e3a 100644
--- a/Source/UI/Items/UIItemRepairWnd.cpp
+++ b/Source/UI/Items/UIItemRepairWnd.cpp
@@ -4,7 +4,6 @@
 #include "Client/Input/InputCharset.h"
 #include "Client/Mode/ModeMgr.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/Items/ItemDescription.h"
 #include "Contents/Items/ItemInfo.h"
diff --git a/Source/UI/Items/UIMakeTargetListWnd.cpp b/Source/UI/Items/UIMakeTargetListWnd.cpp
index 6b8b0f703..5f0f737b3 100644
--- a/Source/UI/Items/UIMakeTargetListWnd.cpp
+++ b/Source/UI/Items/UIMakeTargetListWnd.cpp
@@ -3,7 +3,6 @@
 #include "Client/Input/InputCharset.h"
 #include "Client/Mode/ModeMgr.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Session.h"
 #include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/Items/ItemDescription.h"
diff --git a/Source/UI/Items/UIMakeTargetProcessWnd.cpp b/Source/UI/Items/UIMakeTargetProcessWnd.cpp
index 1dac5f0df..c5c111022 100644
--- a/Source/UI/Items/UIMakeTargetProcessWnd.cpp
+++ b/Source/UI/Items/UIMakeTargetProcessWnd.cpp
@@ -2,7 +2,6 @@
 
 #include "Client/Mode/ModeDragState.h"
 #include "Client/Mode/ModeMgr.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Replay.h"
 #include "Client/Session.h"
 #include "Contents/Items/ItemDescription.h"
diff --git a/Source/UI/Items/UIWeaponRefineWnd.cpp b/Source/UI/Items/UIWeaponRefineWnd.cpp
index 00cc619d4..8bab07e2d 100644
--- a/Source/UI/Items/UIWeaponRefineWnd.cpp
+++ b/Source/UI/Items/UIWeaponRefineWnd.cpp
@@ -3,7 +3,6 @@
 #include "Client/Input/InputCharset.h"
 #include "Client/Mode/ModeMgr.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/Items/ItemDescription.h"
 #include "Contents/Items/ItemInfo.h"
diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp
index 819fc87e8..9a6c45077 100644
--- a/Source/UI/Quest/UIRenewQuestUI.cpp
+++ b/Source/UI/Quest/UIRenewQuestUI.cpp
@@ -1,5 +1,5 @@
 #include "UI/Quest/UIRenewQuestUI.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Contents/MessageTable.h"
 #include "Contents/RenewQuestMgr.h"
 #include "Network/Connection/Connection.h"
diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp
index 4cb749ca3..fcf4b7dc1 100644
--- a/Source/UI/Quest/UIRenewQuestWnd.cpp
+++ b/Source/UI/Quest/UIRenewQuestWnd.cpp
@@ -3,7 +3,7 @@
 #include "UI/Quest/UIRenewQuestWnd.h"
 
 #include "Client/Application/ApplicationWindow.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/Items/ItemDescription.h"
 #include "Contents/MessageTable.h"
diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp
index 507122119..3f9e378af 100644
--- a/Source/UI/Shortcuts/UIShortCutWnd.cpp
+++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp
@@ -37,7 +37,7 @@
 #include "Network/Connection/Connection.h"
 #include "Network/Packets/PacketLengths.h"
 #include "Client/Application/Launcher.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Contents/NavigationManager.h"
 #include "UI/Window/UINavigationWnd.h"
 #include "Utility/Text/FormatString.h"
diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp
index d95e804eb..336499941 100644
--- a/Source/UI/Window/UIMessageBox.cpp
+++ b/Source/UI/Window/UIMessageBox.cpp
@@ -1,6 +1,5 @@
 #include "Render/DeviceContext/DCSurface.h"
 #include "Render/Text/FontCache.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Contents/Items/ItemDescription.h"
 #include "Resource/Bitmap/BitmapResource.h"
 #include "Resource/ResourceMgr.h"
diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp
index 0fcdc0e72..58c984697 100644
--- a/Source/UI/Window/UINavigationWnd.cpp
+++ b/Source/UI/Window/UINavigationWnd.cpp
@@ -2,7 +2,6 @@
 
 #include "Client/Application/Launcher.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Session.h"
 #include "Contents/MessageTable.h"
 #include "Contents/NavigationManager.h"
diff --git a/Source/UI/Window/UIShowWarpWnd.cpp b/Source/UI/Window/UIShowWarpWnd.cpp
index 3ec7c1277..a41e2d43a 100644
--- a/Source/UI/Window/UIShowWarpWnd.cpp
+++ b/Source/UI/Window/UIShowWarpWnd.cpp
@@ -1,6 +1,6 @@
 #include "UI/Window/UIShowWarpWnd.h"
 #include "UI/Buttons/UIBitmapButton.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Client/Session.h"
 #include "Contents/MessageTable.h"
 #include "UI/Lists/UIListBox.h"
diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp
index abe4091d3..5361d93fc 100644
--- a/Source/UI/Window/UIWindow.cpp
+++ b/Source/UI/Window/UIWindow.cpp
@@ -12,7 +12,6 @@
 #include "Client/Input/Language.h"
 #include "Client/Mode/CGameMode.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/MessageTable.h"
 #include "Contents/NavigationManager.h"
@@ -2254,7 +2253,7 @@ int UIWindow::RecordEditTexts() {
   record.bytes = static_cast<std::uint16_t>(offset);
   record.marker = 0x038608AEu;
   record.windowId = this->geometry.id;
-  reinterpret_cast<ReplayPacketRecorder*>(&Replay::Instance())->Record(record.bytes, &record, 41, 0);
+  Replay::Instance().Record(record.bytes, &record, 41, 0);
   return offset;
 }
 
diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp
index bc957da25..dfb1de4ce 100644
--- a/Source/UI/Window/UIWindowMgr.cpp
+++ b/Source/UI/Window/UIWindowMgr.cpp
@@ -5,7 +5,6 @@
 #include "Client/Input/Mouse.h"
 #include "Client/Mode/ModeMgr.h"
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/Session.h"
 #include "Contents/Configuration/ServiceConfiguration.h"
 #include "Contents/Configuration/ServiceOptions.h"
@@ -2528,23 +2527,7 @@ bool UIWindowMgr::CloseWindow(int id) {
     static_assert(sizeof(WindowClosePacket) == 10);
     WindowClosePacket packet{0x039208AEu, 10, id};
 
-    Replay& replay = Replay::Instance();
-    ReplayPacketRecorder recorder = {
-      g_packetLengths,
-      replay.baseFrame,
-      replay.started,
-      replay.frame,
-      replay.header.key0,
-      replay.header.key1,
-      replay.header.options.recordRestricted,
-      replay.file,
-      replay.fileOffset,
-      replay.records,
-      replay.cipherIndex,
-      replay.cipherBase,
-      replay.cipherKey,
-    };
-    recorder.Record(packet.bytes, &packet, 42, 0);
+    Replay::Instance().Record(packet.bytes, &packet, 42, 0);
   }
 
   switch (id) {
diff --git a/Source/UI/Window/WindowAncestry.cpp b/Source/UI/Window/WindowAncestry.cpp
index fbd741b20..ae3ec80cf 100644
--- a/Source/UI/Window/WindowAncestry.cpp
+++ b/Source/UI/Window/WindowAncestry.cpp
@@ -1,5 +1,4 @@
 #include "Client/Replay.h"
-#include "Client/ReplayPacketRecorder.h"
 #include "Client/ReplayRecordOption.h"
 #include "UI/Window/UIWindow.h"
 #include "UI/Window/UIWindowMgr.h"
@@ -72,7 +71,7 @@ void UIWindowMgr::RecordWindowPacket(int argument) {
     packet.header = 0x038D08AE;
     packet.length = 10;
     packet.value = static_cast<std::uint32_t>(argument);
-    reinterpret_cast<ReplayPacketRecorder*>(&Replay::Instance())->Record(10, &packet, 42, 0);
+    Replay::Instance().Record(10, &packet, 42, 0);
   }
 }
 
diff --git a/Source/UI/Window/WindowMgrState.cpp b/Source/UI/Window/WindowMgrState.cpp
index f1474b52a..37ffcc3b3 100644
--- a/Source/UI/Window/WindowMgrState.cpp
+++ b/Source/UI/Window/WindowMgrState.cpp
@@ -3,7 +3,7 @@
 #include "Client/Mode/ModeDragState.h"
 #include "Client/Mode/ModeMgr.h"
 #include "Client/Registry.h"
-#include "Client/ReplayPacketRecorder.h"
+#include "Client/Replay.h"
 #include "Client/Session.h"
 #include "Contents/Actors/Pc.h"
 #include "Contents/Configuration/ServiceConfiguration.h"