diff --git a/src/adapters/src/rendering/femtovg/main_window.rs b/src/adapters/src/rendering/femtovg/main_window.rs
index 2b8dc84..1cfed22 100644
--- a/src/adapters/src/rendering/femtovg/main_window.rs
+++ b/src/adapters/src/rendering/femtovg/main_window.rs
@@ -66,10 +66,6 @@ impl RenderableWindow for FemtoVGWindow {
     fn size_cell(&self) -> &Cell<PhysicalSize> {
         &self.size
     }
-
-    fn scale_factor_cell(&self) -> &Cell<f32> {
-        &self.scale_factor
-    }
 }
 
 impl WindowAdapter for FemtoVGWindow {
diff --git a/src/adapters/src/rendering/femtovg/popup_window.rs b/src/adapters/src/rendering/femtovg/popup_window.rs
index ffef184..7a2445c 100644
--- a/src/adapters/src/rendering/femtovg/popup_window.rs
+++ b/src/adapters/src/rendering/femtovg/popup_window.rs
@@ -143,10 +143,6 @@ impl RenderableWindow for PopupWindow {
     fn size_cell(&self) -> &Cell<PhysicalSize> {
         &self.size
     }
-
-    fn scale_factor_cell(&self) -> &Cell<f32> {
-        &self.scale_factor
-    }
 }
 
 impl WindowAdapter for PopupWindow {
diff --git a/src/adapters/src/rendering/femtovg/renderable_window.rs b/src/adapters/src/rendering/femtovg/renderable_window.rs
index 36173c9..b735b13 100644
--- a/src/adapters/src/rendering/femtovg/renderable_window.rs
+++ b/src/adapters/src/rendering/femtovg/renderable_window.rs
@@ -16,7 +16,6 @@ pub trait RenderableWindow: WindowAdapter {
     fn scale_factor(&self) -> f32;
     fn render_state(&self) -> &Cell<RenderState>;
     fn size_cell(&self) -> &Cell<PhysicalSize>;
-    fn scale_factor_cell(&self) -> &Cell<f32>;
 
     fn request_redraw(&self) {
         self.render_state().set(RenderState::Dirty);
diff --git a/src/adapters/src/wayland/connection.rs b/src/adapters/src/wayland/connection.rs
deleted file mode 100644
index 2a7b738..0000000
--- a/src/adapters/src/wayland/connection.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use crate::errors::Result;
-use std::rc::Rc;
-use wayland_client::{Connection, EventQueue};
-
-pub fn initialize_wayland<S>() -> Result<(Rc<Connection>, EventQueue<S>)> {
-    let connection = Rc::new(Connection::connect_to_env()?);
-    let event_queue = connection.new_event_queue();
-    Ok((connection, event_queue))
-}
diff --git a/src/adapters/src/wayland/managed_proxies.rs b/src/adapters/src/wayland/managed_proxies.rs
index b8241d7..09bb577 100644
--- a/src/adapters/src/wayland/managed_proxies.rs
+++ b/src/adapters/src/wayland/managed_proxies.rs
@@ -20,10 +20,6 @@ impl ManagedWlPointer {
             connection,
         }
     }
-
-    pub const fn inner(&self) -> &Rc<WlPointer> {
-        &self.pointer
-    }
 }
 
 impl Deref for ManagedWlPointer {
@@ -57,10 +53,6 @@ impl ManagedWlSurface {
             connection,
         }
     }
-
-    pub const fn inner(&self) -> &Rc<WlSurface> {
-        &self.surface
-    }
 }
 
 impl Deref for ManagedWlSurface {
@@ -171,10 +163,6 @@ impl ManagedWpViewport {
             connection,
         }
     }
-
-    pub const fn inner(&self) -> &Rc<WpViewport> {
-        &self.viewport
-    }
 }
 
 impl Deref for ManagedWpViewport {
diff --git a/src/adapters/src/wayland/mod.rs b/src/adapters/src/wayland/mod.rs
index 6638e9f..713e5b6 100644
--- a/src/adapters/src/wayland/mod.rs
+++ b/src/adapters/src/wayland/mod.rs
@@ -1,5 +1,4 @@
 pub(crate) mod config;
-pub(crate) mod connection;
 pub(crate) mod event_handling;
 pub(crate) mod globals;
 pub(crate) mod managed_proxies;
diff --git a/src/adapters/src/wayland/surfaces/event_bus.rs b/src/adapters/src/wayland/surfaces/event_bus.rs
index 44f7fe1..84ada31 100644
--- a/src/adapters/src/wayland/surfaces/event_bus.rs
+++ b/src/adapters/src/wayland/surfaces/event_bus.rs
@@ -22,21 +22,10 @@ impl EventBus {
         }
     }
 
-    pub fn subscribe<F>(&self, handler: F)
-    where
-        F: Fn(&WindowStateEvent) + 'static,
-    {
-        self.handlers.borrow_mut().push(Box::new(handler));
-    }
-
     pub fn publish(&self, event: &WindowStateEvent) {
         let handlers = self.handlers.borrow();
         for handler in handlers.iter() {
             handler(event);
         }
     }
-
-    pub fn clear(&self) {
-        self.handlers.borrow_mut().clear();
-    }
 }
diff --git a/src/adapters/src/wayland/surfaces/event_context.rs b/src/adapters/src/wayland/surfaces/event_context.rs
index 6462ea9..a41a4fe 100644
--- a/src/adapters/src/wayland/surfaces/event_context.rs
+++ b/src/adapters/src/wayland/surfaces/event_context.rs
@@ -66,14 +66,6 @@ impl EventContext {
         }
     }
 
-    pub fn set_event_bus(&mut self, event_bus: EventBus) {
-        self.event_bus = event_bus;
-    }
-
-    pub const fn event_bus(&self) -> &EventBus {
-        &self.event_bus
-    }
-
     pub fn set_popup_manager(&mut self, popup_manager: Rc<PopupManager>) {
         self.popup_manager = Some(popup_manager);
         self.event_bus
@@ -89,10 +81,6 @@ impl EventContext {
         self.display_metrics.borrow().scale_factor()
     }
 
-    pub const fn display_metrics(&self) -> &SharedDisplayMetrics {
-        &self.display_metrics
-    }
-
     #[allow(clippy::cast_precision_loss)]
     pub fn update_scale_factor(&mut self, scale_120ths: u32) -> f32 {
         let new_scale_factor = self
diff --git a/src/adapters/src/wayland/surfaces/event_router.rs b/src/adapters/src/wayland/surfaces/event_router.rs
deleted file mode 100644
index 741a02e..0000000
--- a/src/adapters/src/wayland/surfaces/event_router.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use crate::rendering::femtovg::main_window::FemtoVGWindow;
-use crate::wayland::surfaces::popup_manager::{ActiveWindow, PopupManager};
-use slint::platform::{WindowAdapter, WindowEvent};
-use std::rc::Rc;
-use wayland_client::{backend::ObjectId, protocol::wl_surface::WlSurface};
-
-pub struct EventRouter {
-    main_window: Rc<FemtoVGWindow>,
-    popup_manager: Option<Rc<PopupManager>>,
-    main_surface_id: ObjectId,
-}
-
-impl EventRouter {
-    #[must_use]
-    pub const fn new(main_window: Rc<FemtoVGWindow>, main_surface_id: ObjectId) -> Self {
-        Self {
-            main_window,
-            popup_manager: None,
-            main_surface_id,
-        }
-    }
-
-    pub fn set_popup_manager(&mut self, popup_manager: Rc<PopupManager>) {
-        self.popup_manager = Some(popup_manager);
-    }
-
-    pub fn dispatch_to_active_window(&self, event: WindowEvent, surface: &WlSurface) {
-        if let Some(popup_manager) = &self.popup_manager {
-            match popup_manager.get_active_window(surface, &self.main_surface_id) {
-                ActiveWindow::Main => {
-                    self.main_window.window().dispatch_event(event);
-                }
-                ActiveWindow::Popup(index) => {
-                    if let Some(popup_window) = popup_manager.get_popup_window(index) {
-                        popup_window.dispatch_event(event);
-                    }
-                }
-                ActiveWindow::None => {}
-            }
-        }
-    }
-}
diff --git a/src/adapters/src/wayland/surfaces/mod.rs b/src/adapters/src/wayland/surfaces/mod.rs
index 3eda1ba..ae4c36c 100644
--- a/src/adapters/src/wayland/surfaces/mod.rs
+++ b/src/adapters/src/wayland/surfaces/mod.rs
@@ -3,7 +3,6 @@ pub mod dimensions;
 pub mod display_metrics;
 pub mod event_bus;
 pub mod event_context;
-pub mod event_router;
 pub mod layer_surface;
 pub mod popup_manager;
 pub mod popup_surface;
diff --git a/src/adapters/src/wayland/surfaces/window_events.rs b/src/adapters/src/wayland/surfaces/window_events.rs
index f4b2549..9b89baa 100644
--- a/src/adapters/src/wayland/surfaces/window_events.rs
+++ b/src/adapters/src/wayland/surfaces/window_events.rs
@@ -1,6 +1,6 @@
 use slint::PhysicalSize;
-use wayland_client::backend::ObjectId;
 
+#[allow(dead_code)]
 #[derive(Debug, Clone)]
 pub enum WindowStateEvent {
     ScaleFactorChanged {
@@ -8,11 +8,6 @@ pub enum WindowStateEvent {
         source: ScaleSource,
     },
 
-    SizeChanged {
-        logical_width: u32,
-        logical_height: u32,
-    },
-
     OutputSizeChanged {
         output_size: PhysicalSize,
     },
@@ -26,27 +21,11 @@ pub enum WindowStateEvent {
         serial: u32,
     },
 
-    SurfaceEntered {
-        surface_id: ObjectId,
-    },
-
-    SurfaceExited,
-
-    RenderRequested,
-
     PopupConfigurationChanged,
 }
 
+#[allow(dead_code)]
 #[derive(Debug, Clone, Copy)]
 pub enum ScaleSource {
     FractionalScale,
-    IntegerScale,
-}
-
-pub trait WindowStateEventHandler {
-    fn handle_event(&mut self, event: &WindowStateEvent);
-}
-
-pub trait WindowStateEventEmitter {
-    fn emit_event(&self, event: WindowStateEvent);
 }