diff --git a/server/src/server/services/tables_data_service.rs b/server/src/server/services/tables_data_service.rs
index 105481a..3b566da 100644
--- a/server/src/server/services/tables_data_service.rs
+++ b/server/src/server/services/tables_data_service.rs
@@ -1,7 +1,7 @@
 // src/server/services/tables_data_service.rs
 use tonic::{Request, Response, Status};
 use common::proto::multieko2::tables_data::tables_data_server::TablesData;
-use common::proto::multieko2::common::{CountResponse, PositionRequest};
+use common::proto::multieko2::common::CountResponse;
 use common::proto::multieko2::tables_data::{
     PostTableDataRequest, PostTableDataResponse,
     PutTableDataRequest, PutTableDataResponse,
diff --git a/server/src/table_definition/handlers/post_table_definition.rs b/server/src/table_definition/handlers/post_table_definition.rs
index b3fbf3a..d0d59d6 100644
--- a/server/src/table_definition/handlers/post_table_definition.rs
+++ b/server/src/table_definition/handlers/post_table_definition.rs
@@ -168,7 +168,6 @@ fn generate_table_sql(
     let mut system_columns = vec![
         "id BIGSERIAL PRIMARY KEY".to_string(),
         "deleted BOOLEAN NOT NULL DEFAULT FALSE".to_string(),
-        "firma TEXT NOT NULL".to_string(),
     ];
 
     if let Some(linked) = linked_table {
@@ -195,9 +194,7 @@ fn generate_table_sql(
         all_columns.join(",\n    ")
     );
 
-    let mut system_indexes = vec![
-        format!("CREATE INDEX idx_{}_firma ON \"{}\" (firma)", table_name, table_name),
-    ];
+    let mut system_indexes = vec![];
 
     if let Some(linked) = linked_table {
         let parts: Vec<&str> = linked.splitn(2, '_').collect();
diff --git a/server/src/tables_data/handlers/get_table_data_count.rs b/server/src/tables_data/handlers/get_table_data_count.rs
index d4f729d..e8cec67 100644
--- a/server/src/tables_data/handlers/get_table_data_count.rs
+++ b/server/src/tables_data/handlers/get_table_data_count.rs
@@ -1,7 +1,7 @@
 // src/tables_data/handlers/get_table_data_count.rs
 use tonic::Status;
 use sqlx::PgPool;
-use common::proto::multieko2::common::{CountResponse, Empty};
+use common::proto::multieko2::common::CountResponse;
 use common::proto::multieko2::tables_data::GetTableDataCountRequest;
 
 pub async fn get_table_data_count(