diff --git a/client/src/components/admin/add_table.rs b/client/src/components/admin/add_table.rs
index e545818..d8ba85a 100644
--- a/client/src/components/admin/add_table.rs
+++ b/client/src/components/admin/add_table.rs
@@ -2,7 +2,7 @@
 use crate::config::colors::themes::Theme;
 use crate::state::app::state::AppState;
 use crate::state::pages::add_table::{AddTableFocus, AddTableState};
-use canvas::{render_canvas_default, render_canvas, FormEditor};
+use canvas::{render_canvas, FormEditor};
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::{Modifier, Style},
diff --git a/client/src/components/auth/register.rs b/client/src/components/auth/register.rs
index 254fc4e..76e9453 100644
--- a/client/src/components/auth/register.rs
+++ b/client/src/components/auth/register.rs
@@ -13,7 +13,7 @@ use ratatui::{
     widgets::{Block, BorderType, Borders, Paragraph},
     Frame,
 };
-use canvas::{FormEditor, render_canvas_default, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
+use canvas::{FormEditor, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
 
 pub fn render_register(
     f: &mut Frame,
diff --git a/client/src/components/common/status_line.rs b/client/src/components/common/status_line.rs
index 19dd385..499f9cf 100644
--- a/client/src/components/common/status_line.rs
+++ b/client/src/components/common/status_line.rs
@@ -4,11 +4,10 @@ use crate::state::app::state::AppState;
 use ratatui::{
     layout::Rect,
     style::Style,
-    text::{Line, Span, Text},
+    text::{Line, Span},
     widgets::Paragraph,
     Frame,
 };
-use ratatui::widgets::Wrap;
 use std::path::Path;
 use unicode_width::UnicodeWidthStr;
 
diff --git a/client/src/components/form/form.rs b/client/src/components/form/form.rs
index 492d2ef..9e3b7dd 100644
--- a/client/src/components/form/form.rs
+++ b/client/src/components/form/form.rs
@@ -8,9 +8,8 @@ use ratatui::{
     widgets::{Block, Borders, Paragraph},
     Frame,
 };
-use canvas::canvas::HighlightState;
 use canvas::{
-    render_canvas, render_suggestions_dropdown, DefaultCanvasTheme, FormEditor,
+    render_canvas, render_suggestions_dropdown, DefaultCanvasTheme,
 };
 
 pub fn render_form(
diff --git a/client/src/modes/common/command_mode.rs b/client/src/modes/common/command_mode.rs
index b1d53c9..a0a85c3 100644
--- a/client/src/modes/common/command_mode.rs
+++ b/client/src/modes/common/command_mode.rs
@@ -3,7 +3,6 @@
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::pages::form::FormState;
 use crate::state::{app::state::AppState, pages::auth::LoginState, pages::auth::RegisterState};
 use crate::modes::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
diff --git a/client/src/modes/common/commands.rs b/client/src/modes/common/commands.rs
index 104e908..1b2a154 100644
--- a/client/src/modes/common/commands.rs
+++ b/client/src/modes/common/commands.rs
@@ -1,7 +1,7 @@
 // src/modes/common/commands.rs
 use crate::tui::terminal::core::TerminalCore;
 use crate::state::app::state::AppState;
-use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState};
+use crate::state::pages::{auth::LoginState, auth::RegisterState};
 use anyhow::Result;
 
 pub struct CommandHandler;
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 1bd7c4e..e2ad54a 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -1,7 +1,7 @@
 // src/modes/handlers/event.rs
 use crate::config::binds::config::Config;
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use crate::buffer::{AppView, BufferState, switch_buffer, functions, toggle_buffer_list};
+use crate::buffer::{AppView, BufferState, switch_buffer, toggle_buffer_list};
 use crate::sidebar::toggle_sidebar;
 use crate::search::event::handle_search_palette_event;
 use crate::functions::modes::navigation::add_logic_nav;
@@ -18,7 +18,7 @@ use crate::modes::{
 };
 use crate::services::auth::AuthClient;
 use crate::services::grpc_client::GrpcClient;
-use canvas::{FormEditor, AppMode as CanvasMode};
+use canvas::AppMode as CanvasMode;
 use crate::state::{
     app::{
         state::AppState,
@@ -42,11 +42,9 @@ use crate::ui::handlers::context::UiContext;
 use canvas::KeyEventOutcome;
 use anyhow::Result;
 use common::proto::komp_ac::search::search_response::Hit;
-use crossterm::event::KeyModifiers;
-use crossterm::event::{Event, KeyCode, KeyEvent};
+use crossterm::event::{Event, KeyCode};
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::unbounded_channel;
-use tracing::{error, info};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum EventOutcome {
diff --git a/client/src/modes/handlers/mode_manager.rs b/client/src/modes/handlers/mode_manager.rs
index 02f05a9..5b32721 100644
--- a/client/src/modes/handlers/mode_manager.rs
+++ b/client/src/modes/handlers/mode_manager.rs
@@ -3,7 +3,6 @@ use crate::state::app::state::AppState;
 use crate::modes::handlers::event::EventHandler;
 use crate::state::pages::add_logic::AddLogicFocus;
 use crate::state::pages::admin::AdminState;
-use canvas::AppMode as CanvasMode;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AppMode {
diff --git a/client/src/search/event.rs b/client/src/search/event.rs
index 33439f1..8a43a66 100644
--- a/client/src/search/event.rs
+++ b/client/src/search/event.rs
@@ -1,5 +1,4 @@
 // src/search/event.rs
-use crate::search::state::SearchState;
 use crate::state::app::state::AppState;
 use crate::services::grpc_client::GrpcClient;
 use common::proto::komp_ac::search::search_response::Hit;
diff --git a/client/src/state/pages/add_table.rs b/client/src/state/pages/add_table.rs
index 5531f49..36cafa8 100644
--- a/client/src/state/pages/add_table.rs
+++ b/client/src/state/pages/add_table.rs
@@ -1,6 +1,6 @@
 // src/state/pages/add_table.rs
 
-use canvas::{DataProvider, CanvasAction, AppMode};
+use canvas::{DataProvider, AppMode};
 use ratatui::widgets::TableState;
 use serde::{Deserialize, Serialize};
 
diff --git a/client/src/state/pages/auth.rs b/client/src/state/pages/auth.rs
index cf15e6d..fe06f07 100644
--- a/client/src/state/pages/auth.rs
+++ b/client/src/state/pages/auth.rs
@@ -1,5 +1,5 @@
 // src/state/pages/auth.rs
-use canvas::{DataProvider, AppMode, SuggestionItem};
+use canvas::{DataProvider, AppMode};
 use lazy_static::lazy_static;
 
 lazy_static! {
diff --git a/client/src/state/pages/form.rs b/client/src/state/pages/form.rs
index 151b472..50970f9 100644
--- a/client/src/state/pages/form.rs
+++ b/client/src/state/pages/form.rs
@@ -1,10 +1,7 @@
 // src/state/pages/form.rs
 
-use crate::config::colors::themes::Theme;
-use canvas::{DataProvider, AppMode, EditorState, FormEditor};
+use canvas::{DataProvider, AppMode};
 use common::proto::komp_ac::search::search_response::Hit;
-use ratatui::layout::Rect;
-use ratatui::Frame;
 use std::collections::HashMap;
 
 fn json_value_to_string(value: &serde_json::Value) -> String {
diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs
index c4033ae..625a34e 100644
--- a/client/src/ui/handlers/render.rs
+++ b/client/src/ui/handlers/render.rs
@@ -53,7 +53,7 @@ pub fn render_ui(
     render_background(f, f.area(), theme);
 
     // --- START DYNAMIC LAYOUT LOGIC ---
-    let mut status_line_height = 1;
+    let status_line_height = 1;
     #[cfg(feature = "ui-debug")]
     {
         if let Some(debug_state) = &app_state.debug_state {
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 8f7d49c..2f8e39a 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -32,7 +32,7 @@ use crossterm::cursor::SetCursorStyle;
 use crossterm::event as crossterm_event;
 use tracing::{error, info, warn};
 use tokio::sync::mpsc;
-use std::time::{Instant, Duration};
+use std::time::Instant;
 #[cfg(feature = "ui-debug")]
 use crate::state::app::state::DebugState;
 #[cfg(feature = "ui-debug")]