diff --git a/src/lib/arch/Arch.cpp b/src/lib/arch/Arch.cpp
index 09ef1571f..23f2a5dfc 100644
--- a/src/lib/arch/Arch.cpp
+++ b/src/lib/arch/Arch.cpp
@@ -30,9 +30,6 @@ Arch::Arch(Arch *arch)
 
 Arch::~Arch()
 {
-#if SYSAPI_WIN32
-  ArchMiscWindows::cleanup();
-#endif
 }
 
 void Arch::init()
diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp
index 445bd1326..b2167747d 100644
--- a/src/lib/arch/win32/ArchMiscWindows.cpp
+++ b/src/lib/arch/win32/ArchMiscWindows.cpp
@@ -51,24 +51,16 @@ const std::string s_binaryName = getBinaryName();
 // ArchMiscWindows
 //
 
-ArchMiscWindows::Dialogs *ArchMiscWindows::s_dialogs = NULL;
 DWORD ArchMiscWindows::s_busyState = 0;
 ArchMiscWindows::STES_t ArchMiscWindows::s_stes = NULL;
 HICON ArchMiscWindows::s_largeIcon = NULL;
 HICON ArchMiscWindows::s_smallIcon = NULL;
 HINSTANCE ArchMiscWindows::s_instanceWin32 = NULL;
 
-void ArchMiscWindows::cleanup()
-{
-  delete s_dialogs;
-}
-
 void ArchMiscWindows::init()
 {
   // stop windows system error dialogs from showing.
   SetErrorMode(SEM_FAILCRITICALERRORS);
-
-  s_dialogs = new Dialogs;
 }
 
 int ArchMiscWindows::runDaemon(RunFunc runFunc)
@@ -258,11 +250,6 @@ ArchMiscWindows::readValueInt(HKEY key, const TCHAR *name)
 
 bool ArchMiscWindows::processDialog(MSG *msg)
 {
-  for (Dialogs::const_iterator index = s_dialogs->begin(); index != s_dialogs->end(); ++index) {
-    if (IsDialogMessage(*index, msg)) {
-      return true;
-    }
-  }
   return false;
 }
 
diff --git a/src/lib/arch/win32/ArchMiscWindows.h b/src/lib/arch/win32/ArchMiscWindows.h
index e4db5e9df..b1598be43 100644
--- a/src/lib/arch/win32/ArchMiscWindows.h
+++ b/src/lib/arch/win32/ArchMiscWindows.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <set>
 #include <string>
 
 #define WIN32_LEAN_AND_MEAN
@@ -41,9 +40,6 @@ public:
   //! Initialize
   static void init();
 
-  //! Delete memory
-  static void cleanup();
-
   //! Run the daemon
   /*!
   Delegates to ArchDaemonWindows.
@@ -173,10 +169,8 @@ private:
   static HMODULE findLoadedModule(std::array<const char *, 2> moduleNames);
 
 private:
-  using Dialogs = std::set<HWND>;
   typedef DWORD(WINAPI *STES_t)(DWORD);
 
-  static Dialogs *s_dialogs;
   static DWORD s_busyState;
   static STES_t s_stes; // STES: Set thread execution state
   static HICON s_largeIcon;