diff --git a/GWToolboxdll/Modules/ChatCommands.cpp b/GWToolboxdll/Modules/ChatCommands.cpp
index 82c6196dd..35955eedd 100644
--- a/GWToolboxdll/Modules/ChatCommands.cpp
+++ b/GWToolboxdll/Modules/ChatCommands.cpp
@@ -27,6 +27,7 @@
 #include <GWCA/Managers/AgentMgr.h>
 #include <GWCA/Managers/CameraMgr.h>
 #include <GWCA/Managers/MemoryMgr.h>
+#include <GWCA/Managers/QuestMgr.h>
 #include <GWCA/Managers/PlayerMgr.h>
 #include <GWCA/Managers/SkillbarMgr.h>
 #include <GWCA/Managers/FriendListMgr.h>
@@ -43,7 +44,6 @@
 #include <Logger.h>
 
 #include <Modules/ChatCommands.h>
-#include <Modules/ObserverModule.h>
 #include <Modules/GameSettings.h>
 #include <Modules/ChatSettings.h>
 #include <Modules/InventoryManager.h>
@@ -56,8 +56,6 @@
 #include <Modules/HallOfMonumentsModule.h>
 #include <Modules/DialogModule.h>
 #include <Modules/Resources.h>
-#include <GWCA/Managers/QuestMgr.h>
-#include <Widgets/BondsWidget.h>
 
 constexpr auto CMDTITLE_KEEP_CURRENT = 0xfffe;
 constexpr auto CMDTITLE_REMOVE_CURRENT = 0xffff;
diff --git a/GWToolboxdll/Windows/InfoWindow.cpp b/GWToolboxdll/Windows/InfoWindow.cpp
index a096e49d2..609a8605e 100644
--- a/GWToolboxdll/Windows/InfoWindow.cpp
+++ b/GWToolboxdll/Windows/InfoWindow.cpp
@@ -953,6 +953,7 @@ namespace {
         [[maybe_unused]] const GW::Chat::ChatBuffer* log = GW::Chat::GetChatLog();
         [[maybe_unused]] const GW::AreaInfo* ai = GW::Map::GetMapInfo(GW::Map::GetMapID());
 
+#ifdef _DEBUG
         const auto frame = GW::UI::GetFrameByLabel(L"NPCInteract");
         if (frame && frame->IsVisible()) {
             auto dialog_buttons_frame = GW::UI::GetChildFrame(frame, 2); // Scrollable frame
@@ -972,8 +973,8 @@ namespace {
                     draw_list->AddText({ top_left.x, top_left.y }, IM_COL32_WHITE, label.c_str());
                 }
             }
-
         }
+#endif
     }
 }