diff --git a/services/appflowy-collaborate/src/group/broadcast.rs b/services/appflowy-collaborate/src/group/broadcast.rs
index 92b647fd..12f5ddcb 100644
--- a/services/appflowy-collaborate/src/group/broadcast.rs
+++ b/services/appflowy-collaborate/src/group/broadcast.rs
@@ -431,13 +431,8 @@ async fn handle_message(
             // send one ack back to the client.
             if ack_response.is_none() {
               ack_response = Some(
-                CollabAck::new(
-                  message_origin.clone(),
-                  object_id.to_string(),
-                  msg_id,
-                  seq_num,
-                )
-                .with_payload(payload.unwrap_or_default()),
+                CollabAck::new(CollabOrigin::Server, object_id.to_string(), msg_id, seq_num)
+                  .with_payload(payload.unwrap_or_default()),
               );
             }
           },
@@ -453,14 +448,9 @@ async fn handle_message(
             };
 
             ack_response = Some(
-              CollabAck::new(
-                message_origin.clone(),
-                object_id.to_string(),
-                msg_id,
-                seq_num,
-              )
-              .with_code(code)
-              .with_payload(payload),
+              CollabAck::new(CollabOrigin::Server, object_id.to_string(), msg_id, seq_num)
+                .with_code(code)
+                .with_payload(payload),
             );
 
             break;
diff --git a/services/appflowy-worker/src/import_worker/worker.rs b/services/appflowy-worker/src/import_worker/worker.rs
index 865058e2..269ce1db 100644
--- a/services/appflowy-worker/src/import_worker/worker.rs
+++ b/services/appflowy-worker/src/import_worker/worker.rs
@@ -44,7 +44,6 @@ use redis::{AsyncCommands, RedisResult, Value};
 use database::pg_row::AFImportTask;
 use serde::{Deserialize, Serialize};
 use serde_json::from_str;
-use sqlx::types::chrono;
 use sqlx::types::chrono::{DateTime, TimeZone, Utc};
 use sqlx::PgPool;
 use std::collections::{HashMap, HashSet};
@@ -912,7 +911,6 @@ async fn process_unzip_file(
   let mut collab_params_list = vec![];
   let mut database_view_ids_by_database_id: HashMap<String, Vec<String>> = HashMap::new();
   let mut orphan_view_ids = HashSet::new();
-  let timestamp = chrono::Utc::now().timestamp();
 
   // 3. Collect all collabs and resources
   let mut stream = imported.into_collab_stream().await;