diff --git a/crates/adapters/src/lib.rs b/crates/adapters/src/lib.rs
index 5d4ea8b..bb6f5b8 100644
--- a/crates/adapters/src/lib.rs
+++ b/crates/adapters/src/lib.rs
@@ -7,7 +7,7 @@ pub(crate) mod wayland;
 pub use rendering::femtovg::popup_window::PopupWindow;
 
 pub use wayland::config::WaylandWindowConfig;
-pub use wayland::facade::{PopupManagerFacade, ShellContextFacade, WindowingSystemFacade};
+pub use wayland::facade::WindowingSystemFacade;
 pub use wayland::shell_adapter::WaylandWindowingSystem;
 pub use wayland::surfaces::app_state::AppState;
 pub use wayland::surfaces::popup_manager::PopupManager;
diff --git a/crates/adapters/src/wayland/facade.rs b/crates/adapters/src/wayland/facade.rs
index 8511f2a..f6f0aa0 100644
--- a/crates/adapters/src/wayland/facade.rs
+++ b/crates/adapters/src/wayland/facade.rs
@@ -1,12 +1,6 @@
 use crate::errors::Result;
 use crate::wayland::shell_adapter::WaylandWindowingSystem;
-use crate::wayland::surfaces::popup_manager::PopupManager;
-use crate::wayland::surfaces::surface_state::WindowState;
-use layer_shika_domain::errors::DomainError;
-use layer_shika_domain::ports::windowing::ShellContextPort;
 use slint_interpreter::ComponentInstance;
-use std::rc::Rc;
-use std::result::Result as StdResult;
 
 pub struct WindowingSystemFacade {
     inner: WaylandWindowingSystem,
@@ -33,53 +27,3 @@ impl WindowingSystemFacade {
         self.inner.run()
     }
 }
-
-pub struct ShellContextFacade<'a> {
-    window_state: &'a mut WindowState,
-}
-
-impl<'a> ShellContextFacade<'a> {
-    pub fn new(window_state: &'a mut WindowState) -> Self {
-        Self { window_state }
-    }
-
-    pub fn popup_manager(&self) -> Option<Rc<PopupManager>> {
-        self.window_state.popup_manager()
-    }
-
-    pub fn component_instance(&self) -> &ComponentInstance {
-        self.window_state.component_instance()
-    }
-
-    pub fn window_state(&self) -> &WindowState {
-        self.window_state
-    }
-
-    pub fn window_state_mut(&mut self) -> &mut WindowState {
-        self.window_state
-    }
-}
-
-impl ShellContextPort for ShellContextFacade<'_> {
-    fn render_frame_if_dirty(&mut self) -> StdResult<(), DomainError> {
-        self.window_state
-            .render_frame_if_dirty()
-            .map_err(|e| DomainError::Adapter {
-                source: Box::new(e),
-            })
-    }
-}
-
-pub struct PopupManagerFacade {
-    inner: Rc<PopupManager>,
-}
-
-impl PopupManagerFacade {
-    pub fn new(inner: Rc<PopupManager>) -> Self {
-        Self { inner }
-    }
-
-    pub fn inner(&self) -> &Rc<PopupManager> {
-        &self.inner
-    }
-}
diff --git a/crates/domain/src/entities/component.rs b/crates/domain/src/entities/component.rs
deleted file mode 100644
index 37f47fb..0000000
--- a/crates/domain/src/entities/component.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct UiComponentHandle(usize);
-
-impl UiComponentHandle {
-    #[must_use]
-    pub const fn new(id: usize) -> Self {
-        Self(id)
-    }
-
-    #[must_use]
-    pub const fn id(&self) -> usize {
-        self.0
-    }
-}
diff --git a/crates/domain/src/entities/mod.rs b/crates/domain/src/entities/mod.rs
index 36eb4bf..1589402 100644
--- a/crates/domain/src/entities/mod.rs
+++ b/crates/domain/src/entities/mod.rs
@@ -1,4 +1 @@
-pub mod component;
 pub mod output_registry;
-pub mod surface;
-pub mod window;
diff --git a/crates/domain/src/entities/surface.rs b/crates/domain/src/entities/surface.rs
deleted file mode 100644
index 3f4a151..0000000
--- a/crates/domain/src/entities/surface.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct SurfaceHandle(usize);
-
-impl SurfaceHandle {
-    #[must_use]
-    pub const fn new(id: usize) -> Self {
-        Self(id)
-    }
-
-    #[must_use]
-    pub const fn id(&self) -> usize {
-        self.0
-    }
-}
diff --git a/crates/domain/src/entities/window.rs b/crates/domain/src/entities/window.rs
deleted file mode 100644
index ad9e0ae..0000000
--- a/crates/domain/src/entities/window.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct WindowHandle(usize);
-
-impl WindowHandle {
-    #[must_use]
-    pub const fn new(id: usize) -> Self {
-        Self(id)
-    }
-
-    #[must_use]
-    pub const fn id(&self) -> usize {
-        self.0
-    }
-}
diff --git a/crates/domain/src/prelude.rs b/crates/domain/src/prelude.rs
index 5406be3..56119c4 100644
--- a/crates/domain/src/prelude.rs
+++ b/crates/domain/src/prelude.rs
@@ -4,10 +4,7 @@ pub use crate::config::WindowConfig;
 pub use crate::dimensions::{
     LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize, ScaleFactor,
 };
-pub use crate::entities::component::UiComponentHandle;
 pub use crate::entities::output_registry::OutputRegistry;
-pub use crate::entities::surface::SurfaceHandle;
-pub use crate::entities::window::WindowHandle;
 pub use crate::errors::{DomainError, Result};
 pub use crate::surface_dimensions::SurfaceDimensions;
 pub use crate::value_objects::anchor::AnchorEdges;