diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 79ae0fc..bdfef9a 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -178,11 +178,10 @@ impl EventHandler {
                     &mut self.key_sequence_tracker,
                     current_position,
                     total_count,
-                    terminal,
+                    grpc_client,
                     &mut self.command_message,
                     &mut self.edit_mode_cooldown,
                     &mut self.ideal_cursor_column,
-                    grpc_client,  // Moved to end
                 ).await;
             }
         }
diff --git a/client/src/modes/handlers/read_only.rs b/client/src/modes/handlers/read_only.rs
index a1b2157..8a30fce 100644
--- a/client/src/modes/handlers/read_only.rs
+++ b/client/src/modes/handlers/read_only.rs
@@ -4,10 +4,7 @@ use crossterm::event::{KeyEvent};
 use crate::config::config::Config;
 use crate::ui::handlers::form::FormState;
 use crate::config::key_sequences::KeySequenceTracker;
-use crate::tui::terminal::{
-    core::TerminalCore,
-    grpc_client::GrpcClient,
-};
+use crate::tui::terminal::grpc_client::GrpcClient;
 
 #[derive(PartialEq)]
 enum CharType {
@@ -23,7 +20,6 @@ pub async fn handle_read_only_event(
     key_sequence_tracker: &mut KeySequenceTracker,
     current_position: &mut u64,
     total_count: u64,
-    terminal: &mut TerminalCore,
     grpc_client: &mut GrpcClient,
     command_message: &mut String,
     edit_mode_cooldown: &mut bool,