diff --git a/client/src/functions/mod.rs b/client/src/functions/mod.rs
index 5185333..411f408 100644
--- a/client/src/functions/mod.rs
+++ b/client/src/functions/mod.rs
@@ -3,5 +3,4 @@
 pub mod common;
 pub mod modes;
 
-pub use common::*;
 pub use modes::*;
diff --git a/client/src/functions/modes/edit/auth_e.rs b/client/src/functions/modes/edit/auth_e.rs
index f977a79..3aa38ca 100644
--- a/client/src/functions/modes/edit/auth_e.rs
+++ b/client/src/functions/modes/edit/auth_e.rs
@@ -1,6 +1,5 @@
 // src/functions/modes/edit/auth_e.rs
 
-use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
diff --git a/client/src/functions/modes/edit/form_e.rs b/client/src/functions/modes/edit/form_e.rs
index 62c57a6..efb12ec 100644
--- a/client/src/functions/modes/edit/form_e.rs
+++ b/client/src/functions/modes/edit/form_e.rs
@@ -1,6 +1,5 @@
 // src/functions/modes/edit/form_e.rs
 
-use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
diff --git a/client/src/modes/canvas/edit.rs b/client/src/modes/canvas/edit.rs
index ba3bcae..4c249ee 100644
--- a/client/src/modes/canvas/edit.rs
+++ b/client/src/modes/canvas/edit.rs
@@ -3,7 +3,6 @@
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::{auth::AuthState, form::FormState};
-use crate::state::state::AppState;
 use crate::functions::modes::edit::{auth_e, form_e};
 use crossterm::event::{KeyCode, KeyEvent};
 
diff --git a/client/src/state/canvas_state.rs b/client/src/state/canvas_state.rs
index 66a0ae0..0a86d5a 100644
--- a/client/src/state/canvas_state.rs
+++ b/client/src/state/canvas_state.rs
@@ -1,6 +1,5 @@
 // src/state/canvas_state.rs
 
-use crate::state::pages::form::FormState;
 
 pub trait CanvasState {
     fn current_field(&self) -> usize;
diff --git a/client/src/tui/functions.rs b/client/src/tui/functions.rs
index 893d754..6ffe1c1 100644
--- a/client/src/tui/functions.rs
+++ b/client/src/tui/functions.rs
@@ -9,4 +9,3 @@ pub mod common;
 pub use admin::*;
 pub use intro::*;
 pub use form::*;
-pub use common::*;
diff --git a/client/src/tui/functions/common.rs b/client/src/tui/functions/common.rs
index 0fff862..33cb712 100644
--- a/client/src/tui/functions/common.rs
+++ b/client/src/tui/functions/common.rs
@@ -3,5 +3,3 @@
 pub mod form;
 pub mod login;
 
-pub use form::*;
-pub use login::*;
diff --git a/client/src/tui/functions/login.rs b/client/src/tui/functions/login.rs
index 31b1e16..c32a1b8 100644
--- a/client/src/tui/functions/login.rs
+++ b/client/src/tui/functions/login.rs
@@ -1,6 +1,5 @@
 // src/tui/functions/login.rs
 use crate::state::pages::auth::AuthState;
-use crate::state::canvas_state::CanvasState;
 
 pub async fn handle_action(
     action: &str,
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 077e333..fdd22dc 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -2,7 +2,6 @@
 
 use crate::tui::terminal::TerminalCore;
 use crate::services::grpc_client::GrpcClient;
-use crate::services::auth::AuthClient;
 use crate::services::ui_service::UiService;
 use crate::tui::terminal::EventReader;
 use crate::modes::common::commands::CommandHandler;