diff --git a/src/backend/kms/device.rs b/src/backend/kms/device.rs
index 92a27e53..d28dbce8 100644
--- a/src/backend/kms/device.rs
+++ b/src/backend/kms/device.rs
@@ -919,162 +919,6 @@ impl InnerDevice {
     }
 }
 
-impl Device {
-    /*
-    fn dev_node(&self) -> DrmNode {
-        self.dev_node
-    }
-
-    fn render_node(&self) -> DrmNode {
-        self.render_node
-    }
-
-    fn output(&self, conn: &connector::Handle) -> Option<&Output> {
-        self.outputs.get(conn)
-    }
-
-    fn drm_device_mut(&mut self) -> &mut DrmDevice {
-        self.drm.device_mut()
-    }
-
-    fn gbm(&self) -> &GbmDevice<DrmDeviceFd> {
-        &self.gbm
-    }
-
-    fn egl(&mut self) -> &mut Option<EGLInternals> {
-        &mut self.egl
-    }
-
-    fn insert_surface(&mut self, crtc: crtc::Handle, surface: Surface) {
-    }
-
-    fn in_use(&self, primary: Option<&DrmNode>) -> bool {
-    }
-
-    fn add_leased_connector(
-        &mut self,
-        crtc: crtc::Handle,
-        conn: connector::Handle,
-        output: &Output,
-    ) {
-
-    }
-
-    fn update_surface_nodes<'b>(
-        &mut self,
-        used_devices: &HashSet<DrmNode>,
-        mut others: impl Iterator<Item = &'b Device>,
-    ) -> Result<()> {
-
-    }
-    */
-}
-
-impl<'a> LockedDevice<'a> {
-    /*
-    fn dev_node(&self) -> DrmNode {
-        *self.dev_node
-    }
-
-    fn render_node(&self) -> DrmNode {
-        *self.render_node
-    }
-
-    fn output(&self, conn: &connector::Handle) -> Option<&Output> {
-        self.outputs.get(conn)
-    }
-
-    fn drm_device_mut(&mut self) -> &mut DrmDevice {
-        self.drm.device_mut()
-    }
-
-    fn gbm(&self) -> &GbmDevice<DrmDeviceFd> {
-        self.gbm
-    }
-
-    fn egl(&mut self) -> &mut Option<EGLInternals> {
-        self.egl
-    }
-
-    fn insert_surface(&mut self, crtc: crtc::Handle, surface: Surface) {
-        self.surfaces.insert(crtc, surface);
-    }
-
-    fn in_use(&self, primary: Option<&DrmNode>) -> bool {
-        Some(self.render_node) == primary
-            || !self.surfaces.is_empty()
-            || !self.active_buffers.is_empty()
-    }
-
-    fn add_leased_connector(
-        &mut self,
-        crtc: crtc::Handle,
-        conn: connector::Handle,
-        output: &Output,
-    ) {
-        self.leased_connectors.push((conn, crtc));
-        info!(
-            "Connector {} is non-desktop, setting up for leasing",
-            output.name()
-        );
-        if let Some(lease_state) = self.leasing_global.as_mut() {
-            let physical = output.physical_properties();
-            lease_state.add_connector::<State>(
-                conn,
-                output.name(),
-                format!("{} {}", physical.make, physical.model),
-            );
-        }
-    }
-
-    fn update_surface_nodes<'b>(
-        &mut self,
-        used_devices: &HashSet<DrmNode>,
-        mut others: impl Iterator<Item = &'b LockedDevice<'a>>,
-    ) -> Result<()>
-    where
-        'a: 'b,
-    {
-        for surface in self.surfaces.values_mut() {
-            let known_nodes = surface.known_nodes().clone();
-            for gone_device in known_nodes.difference(&used_devices) {
-                surface.remove_node(*gone_device);
-            }
-            for new_device in used_devices.difference(&known_nodes) {
-                let (render_node, egl, gbm) = if *self.render_node == *new_device {
-                    // we need to make sure to do partial borrows here, as device.surfaces is borrowed mutable
-                    (
-                        self.render_node,
-                        self.egl.as_ref().unwrap(),
-                        self.gbm.clone(),
-                    )
-                } else {
-                    let device = others.find(|d| d.render_node == new_device).unwrap();
-                    (
-                        device.render_node,
-                        device.egl.as_ref().unwrap(),
-                        device.gbm.clone(),
-                    )
-                };
-
-                surface.add_node(
-                    *render_node,
-                    GbmAllocator::new(gbm, GbmBufferFlags::RENDERING | GbmBufferFlags::SCANOUT),
-                    EGLContext::new_shared_with_priority(
-                        &egl.display,
-                        &egl.context,
-                        ContextPriority::High,
-                    )
-                    .context("Failed to create shared EGL context")?,
-                );
-            }
-        }
-
-        Ok(())
-    }
-    */
-}
-
 fn create_output_for_conn(drm: &mut DrmDevice, conn: connector::Handle) -> Result<Output> {
     let conn_info = drm
         .get_connector(conn, false)