diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp
index 47ad351ccc..a05ce4f9f9 100644
--- a/Servers/WindowServer/WSWindowManager.cpp
+++ b/Servers/WindowServer/WSWindowManager.cpp
@@ -218,7 +218,6 @@ void WSWindowManager::set_current_menubar(WSMenuBar* menubar)
 
 void WSWindowManager::add_window(WSWindow& window)
 {
-    m_windows.set(&window);
     m_windows_in_order.append(&window);
 
     if (window.is_fullscreen()) {
@@ -258,11 +257,7 @@ void WSWindowManager::move_to_front_and_make_active(WSWindow& window)
 
 void WSWindowManager::remove_window(WSWindow& window)
 {
-    if (!m_windows.contains(&window))
-        return;
-
     invalidate(window);
-    m_windows.remove(&window);
     m_windows_in_order.remove(&window);
     if (window.is_active())
         pick_new_active_window();
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index b80d831bba..f625406bbc 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -58,10 +58,7 @@ public:
 
     void move_to_front_and_make_active(WSWindow&);
 
-    void draw_cursor();
-    void draw_menubar();
     void draw_window_switcher();
-    void draw_geometry_label();
 
     Rect menubar_rect() const;
     WSMenuBar* current_menubar() { return m_current_menubar.ptr(); }
@@ -148,9 +145,7 @@ private:
 
     void close_current_menu();
     virtual void event(CEvent&) override;
-    void compose();
     void paint_window_frame(const WSWindow&);
-    void flip_buffers();
     void tick_clock();
     void tell_wm_listener_about_window(WSWindow& listener, WSWindow&);
     void tell_wm_listener_about_window_icon(WSWindow& listener, WSWindow&);
@@ -180,7 +175,6 @@ private:
     Color m_highlight_window_border_color2;
     Color m_highlight_window_title_color;
 
-    HashMap<int, OwnPtr<WSWindow>> m_windows_by_id;
     HashTable<WSWindow*> m_windows;
     InlineLinkedList<WSWindow> m_windows_in_order;