diff --git a/src/adresar/handlers/delete_adresar.rs b/src/adresar/handlers/delete_adresar.rs
index 9fb996f..1700f6d 100644
--- a/src/adresar/handlers/delete_adresar.rs
+++ b/src/adresar/handlers/delete_adresar.rs
@@ -1,5 +1,5 @@
 // src/adresar/handlers/delete_adresar.rs
-use tonic::{Request, Response, Status};
+use tonic::Status;
 use sqlx::PgPool;
 use crate::proto::multieko2::{DeleteAdresarRequest, DeleteAdresarResponse};
 
diff --git a/src/adresar/handlers/get_adresar.rs b/src/adresar/handlers/get_adresar.rs
index d4b8064..7e7bd4e 100644
--- a/src/adresar/handlers/get_adresar.rs
+++ b/src/adresar/handlers/get_adresar.rs
@@ -1,5 +1,5 @@
 // src/adresar/handlers/get_adresar.rs
-use tonic::{Request, Response, Status};
+use tonic::Status;
 use sqlx::PgPool;
 use crate::adresar::models::Adresar;
 use crate::proto::multieko2::{GetAdresarRequest, AdresarResponse};
diff --git a/src/adresar/handlers/post_adresar.rs b/src/adresar/handlers/post_adresar.rs
index d965b99..3c405b5 100644
--- a/src/adresar/handlers/post_adresar.rs
+++ b/src/adresar/handlers/post_adresar.rs
@@ -1,5 +1,5 @@
 // src/adresar/handlers/post_adresar.rs
-use tonic::{Request, Response, Status};
+use tonic::Status;
 use sqlx::PgPool;
 use crate::adresar::models::Adresar;
 use crate::proto::multieko2::{PostAdresarRequest, AdresarResponse};
diff --git a/src/adresar/handlers/put_adresar.rs b/src/adresar/handlers/put_adresar.rs
index e0df752..da8d9cb 100644
--- a/src/adresar/handlers/put_adresar.rs
+++ b/src/adresar/handlers/put_adresar.rs
@@ -1,5 +1,5 @@
 // src/adresar/handlers/put_adresar.rs
-use tonic::{Request, Response, Status};
+use tonic::Status;
 use sqlx::PgPool;
 use crate::adresar::models::Adresar;
 use crate::proto::multieko2::{PutAdresarRequest, AdresarResponse};
diff --git a/src/client/components1/handlers/status_line.rs b/src/client/components1/handlers/status_line.rs
index b8707db..fa40333 100644
--- a/src/client/components1/handlers/status_line.rs
+++ b/src/client/components1/handlers/status_line.rs
@@ -1,9 +1,8 @@
 // src/client/components/status_line.rs
 use ratatui::{
-    widgets::{Paragraph, Block},
+    widgets::Paragraph,
     style::Style,
-    layout::{Rect, Alignment},
-    text::{Line, Span},
+    layout::Rect,
     Frame,
 };
 use crate::client::colors::Theme;
diff --git a/src/client/components1/mod.rs b/src/client/components1/mod.rs
index 827684e..4792633 100644
--- a/src/client/components1/mod.rs
+++ b/src/client/components1/mod.rs
@@ -3,4 +3,3 @@ pub mod models;
 pub mod handlers;
 
 pub use handlers::*;
-pub use models::*;
diff --git a/src/client/terminal.rs b/src/client/terminal.rs
index 3404553..51ee50e 100644
--- a/src/client/terminal.rs
+++ b/src/client/terminal.rs
@@ -1,5 +1,5 @@
 // src/client/terminal.rs
-use crossterm::event::{self, Event, KeyCode, KeyModifiers};
+use crossterm::event::{self, Event};
 use crossterm::{
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
@@ -13,7 +13,6 @@ use crate::proto::multieko2::{
     Empty, CountResponse, PositionRequest,
     AdresarResponse, PostAdresarRequest, PutAdresarRequest,
 };
-use crate::client::config::Config;
 
 pub struct AppTerminal {
     terminal: Terminal<CrosstermBackend<io::Stdout>>,
diff --git a/src/client/ui/handlers/render.rs b/src/client/ui/handlers/render.rs
index 94d4d07..1d63806 100644
--- a/src/client/ui/handlers/render.rs
+++ b/src/client/ui/handlers/render.rs
@@ -1,8 +1,8 @@
 // src/client/ui/handlers/render.rs
 
-use crate::client::components1::{render_command_line, render_form, render_preview_card, render_status_line};
+use crate::client::components1::{render_command_line, render_preview_card, render_status_line};
 use crate::client::colors::Theme;
-use ratatui::layout::{Constraint, Direction, Layout, Rect};
+use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::Frame;
 use super::form::FormState;
 
diff --git a/src/client/ui/handlers/ui.rs b/src/client/ui/handlers/ui.rs
index 5009148..e8e0962 100644
--- a/src/client/ui/handlers/ui.rs
+++ b/src/client/ui/handlers/ui.rs
@@ -1,10 +1,8 @@
 // src/client/ui/handlers/ui.rs
 
-use crossterm::event::Event;
 use crate::client::terminal::AppTerminal;
 use crate::client::colors::Theme;
 use crate::client::config::Config;
-use ratatui::layout::Rect;
 use crate::client::ui::handlers::{
     event::EventHandler,
     form::FormState,
diff --git a/src/client/ui/mod.rs b/src/client/ui/mod.rs
index 6c75c6f..d548bc7 100644
--- a/src/client/ui/mod.rs
+++ b/src/client/ui/mod.rs
@@ -3,4 +3,3 @@ pub mod models;
 pub mod handlers;
 
 pub use handlers::*;
-pub use models::*;
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 7b172f7..6492d82 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -1,7 +1,6 @@
 // src/server/mod.rs
 use tonic::{Request, Response, Status};
 use tonic_reflection::server::Builder as ReflectionBuilder;
-use crate::db;
 use crate::adresar::handlers::{post_adresar, get_adresar, put_adresar, delete_adresar, get_adresar_count, get_adresar_by_position};
 use crate::proto::multieko2::{
     PostAdresarRequest, AdresarResponse, GetAdresarRequest, PutAdresarRequest,