diff --git a/src-tauri/src/core/setup.rs b/src-tauri/src/core/setup.rs
index bbf8dc9e7..22597a0ae 100644
--- a/src-tauri/src/core/setup.rs
+++ b/src-tauri/src/core/setup.rs
@@ -5,7 +5,7 @@ use std::{
     path::PathBuf,
 };
 use tar::Archive;
-use tauri::{App, Emitter, Manager};
+use tauri::{App, Emitter, Listener, Manager};
 use tauri_plugin_store::StoreExt;
 use tokio::sync::Mutex;
 use tokio::time::{sleep, Duration}; // Using tokio::sync::Mutex
diff --git a/src-tauri/src/core/state.rs b/src-tauri/src/core/state.rs
index fe202c4bd..bb95fdb75 100644
--- a/src-tauri/src/core/state.rs
+++ b/src-tauri/src/core/state.rs
@@ -3,7 +3,6 @@ use std::{collections::HashMap, sync::Arc};
 use crate::core::utils::download::DownloadManagerState;
 use rand::{distributions::Alphanumeric, Rng};
 use rmcp::{service::RunningService, RoleClient};
-use tokio::sync::Mutex;
 use tokio::task::JoinHandle;
 
 /// Server handle type for managing the proxy server lifecycle
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index c56e092e7..493efbdbe 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -7,7 +7,7 @@ use core::{
 };
 use reqwest::Client;
 use std::{collections::HashMap, sync::Arc};
-use tauri::Manager;
+use tauri::{Emitter, Manager};
 
 use tokio::sync::Mutex;
 
@@ -132,7 +132,6 @@ pub fn run() {
             tauri::WindowEvent::CloseRequested { .. } => {
                 if window.label() == "main" {
                     window.emit("kill-mcp-servers", ()).unwrap();
-                    clean_up();
                     let state = window.app_handle().state::<AppState>();
 
                     tauri::async_runtime::block_on(async {