diff --git a/client/src/modes/handlers/common.rs b/client/src/modes/handlers/common.rs
index 06215d7..b7786cf 100644
--- a/client/src/modes/handlers/common.rs
+++ b/client/src/modes/handlers/common.rs
@@ -1,9 +1,6 @@
 // src/modes/handlers/common.rs
 
-use crate::tui::terminal::{
-    core::TerminalCore,
-    grpc_client::GrpcClient,
-};
+use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::ui::handlers::form::FormState;
 use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
 
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index ead0306..bdfef9a 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -66,11 +66,11 @@ impl EventHandler {
                         return Ok((false, message));
                     },
                     "force_quit" => {
-                        let (should_exit, message) = command_handler.handle_command("force_quit", terminal, grpc_client).await?;
+                        let (should_exit, message) = command_handler.handle_command("force_quit", terminal).await?;
                         return Ok((should_exit, message));
                     },
                     "save_and_quit" => {
-                        let (should_exit, message) = command_handler.handle_command("save_and_quit", terminal, grpc_client).await?;
+                        let (should_exit, message) = command_handler.handle_command("save_and_quit", terminal).await?;
                         return Ok((should_exit, message));
                     },
                     "revert" => {
diff --git a/client/src/tui/terminal/commands.rs b/client/src/tui/terminal/commands.rs
index d54760f..57e554e 100644
--- a/client/src/tui/terminal/commands.rs
+++ b/client/src/tui/terminal/commands.rs
@@ -1,7 +1,6 @@
 // src/tui/terminal/commands.rs
 
 use crate::tui::terminal::core::TerminalCore;
-use crate::tui::terminal::grpc_client::GrpcClient;
 
 pub struct CommandHandler {
     is_saved: bool,
@@ -16,7 +15,6 @@ impl CommandHandler {
         &mut self,
         action: &str,
         terminal: &mut TerminalCore,
-        grpc_client: &mut GrpcClient,
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         match action {
             "quit" => self.handle_quit(terminal).await,
diff --git a/client/src/tui/terminal/core.rs b/client/src/tui/terminal/core.rs
index 08623e9..ac80d8c 100644
--- a/client/src/tui/terminal/core.rs
+++ b/client/src/tui/terminal/core.rs
@@ -4,7 +4,6 @@ use crossterm::{
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
     cursor::{SetCursorStyle, EnableBlinking, Show, MoveTo},
-    event::Event,
 };
 use ratatui::{backend::CrosstermBackend, Terminal};
 use std::io::{self, stdout, Write};