diff --git a/src/app_tray/mod.rs b/src/app_tray/mod.rs
index a51409f..d5b627f 100644
--- a/src/app_tray/mod.rs
+++ b/src/app_tray/mod.rs
@@ -5,8 +5,7 @@ use freedesktop_desktop_entry::DesktopEntry;
 use iced::{widget::button, Background, Border, Color, Length, Radius, Theme};
 
 use crate::{
-    compositor::{WaylandOutgoing, WindowHandle, WindowInfo},
-    AppTrayRequest, Message, WindowOperationMessage,
+    compositor::{WaylandOutgoing, WindowHandle, WindowInfo}, Message,
 };
 
 pub mod desktop_entry;
diff --git a/src/compositor/cosmic_comp.rs b/src/compositor/cosmic_comp.rs
index b881c60..9a5dcc0 100644
--- a/src/compositor/cosmic_comp.rs
+++ b/src/compositor/cosmic_comp.rs
@@ -43,10 +43,7 @@ use iced::{
 };
 use once_cell::sync::Lazy;
 
-use crate::{
-    app_tray,
-    compositor::{WindowHandle, WindowInfo},
-};
+use crate::compositor::{WindowHandle, WindowInfo};
 
 use super::WaylandOutgoing;
 
@@ -301,12 +298,11 @@ fn wayland_handler(tx: UnboundedSender<CosmicIncoming>, rx: Channel<WaylandReque
                 .map(|fd| unsafe { UnixStream::from_raw_fd(fd) })
         });
 
-    // let conn = if let Some(socket) = socket {
-    //     Connection::from_socket(socket).unwrap()
-    // } else {
-    //     Connection::connect_to_env().unwrap()
-    // };
-    let conn = Connection::connect_to_env().unwrap();
+    let conn = if let Some(socket) = socket {
+        Connection::from_socket(socket).unwrap()
+    } else {
+        Connection::connect_to_env().unwrap()
+    };
 
     let (globals, event_queue) = registry_queue_init(&conn).unwrap();
 
diff --git a/src/compositor/mod.rs b/src/compositor/mod.rs
index 2275c1f..92627fb 100644
--- a/src/compositor/mod.rs
+++ b/src/compositor/mod.rs
@@ -4,7 +4,7 @@ use cctk::toplevel_info::ToplevelInfo;
 use cosmic_comp::CosmicCompBackend;
 use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1;
 
-use crate::{app_tray::AppTray, Panel};
+use crate::app_tray::AppTray;
 
 pub mod cosmic_comp;
 pub mod wlr;
diff --git a/src/config.rs b/src/config.rs
index d306eb4..a5c904e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,7 +1,4 @@
-use freedesktop_desktop_entry::DesktopEntry;
-use iced::{widget::button, Background, Border, Color, Length, Radius, Theme};
 
-use crate::app_tray::desktop_entry::DesktopEntryCache;
 
 #[derive(Debug, Clone)]
 pub struct PanelConfig {
diff --git a/src/main.rs b/src/main.rs
index 3a6b78d..471feea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-use std::borrow::Borrow;
 
 use app_tray::{AppTray, ApplicationGroup};
 use cctk::wayland_client::protocol::wl_seat::WlSeat;