diff --git a/src/wine-host/bridges/vst2.cpp b/src/wine-host/bridges/vst2.cpp
index 891bc9da..4ef03eed 100644
--- a/src/wine-host/bridges/vst2.cpp
+++ b/src/wine-host/bridges/vst2.cpp
@@ -355,17 +355,13 @@ void Vst2Bridge::handle_x11_events() {
 }
 
 void Vst2Bridge::handle_win32_events() {
-    if (editor) {
-        editor->handle_win32_events();
-    } else {
-        MSG msg;
+    MSG msg;
 
-        for (int i = 0; i < max_win32_messages &&
-                        PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE);
-             i++) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
+    for (int i = 0;
+         i < max_win32_messages && PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE);
+         i++) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
     }
 }
 
diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp
index 49b9c72d..4a4476f4 100644
--- a/src/wine-host/bridges/vst3.cpp
+++ b/src/wine-host/bridges/vst3.cpp
@@ -437,8 +437,6 @@ void Vst3Bridge::handle_x11_events() {
 }
 
 void Vst3Bridge::handle_win32_events() {
-    // TODO: Remove this function from the `Editor`
-
     MSG msg;
 
     for (int i = 0;
diff --git a/src/wine-host/editor.cpp b/src/wine-host/editor.cpp
index 1315b945..2fc56117 100644
--- a/src/wine-host/editor.cpp
+++ b/src/wine-host/editor.cpp
@@ -219,23 +219,6 @@ HWND Editor::get_win32_handle() const {
     }
 }
 
-void Editor::handle_win32_events() const {
-    MSG msg;
-
-    // The null value for the second argument is needed to handle interaction
-    // with child GUI components. So far limiting this to `max_win32_messages`
-    // messages has only been needed for Waves plugins as they otherwise cause
-    // an infinite message loop.
-    // TODO: If the timer is no longer needed, then we can drop this entire
-    //       function
-    for (int i = 0;
-         i < max_win32_messages && PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE);
-         i++) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-}
-
 void Editor::handle_x11_events() const {
     // TODO: Initiating drag-and-drop in Serum _sometimes_ causes the GUI to
     //       update while dragging while other times it does not. From all the
diff --git a/src/wine-host/editor.h b/src/wine-host/editor.h
index 27ab08b0..ec8fba6a 100644
--- a/src/wine-host/editor.h
+++ b/src/wine-host/editor.h
@@ -125,13 +125,6 @@ class Editor {
      */
     bool supports_ewmh_active_window() const;
 
-    /**
-     * Pump messages from the editor loop loop until all events are process.
-     * Must be run from the same thread the GUI was created in because of Win32
-     * limitations.
-     */
-    void handle_win32_events() const;
-
     /**
      * Handle X11 events sent to the window our editor is embedded in.
      */