diff --git a/src/main/frontend/db_worker.cljs b/src/main/frontend/db_worker.cljs
index 48dae70014..2ca568ecf9 100644
--- a/src/main/frontend/db_worker.cljs
+++ b/src/main/frontend/db_worker.cljs
@@ -15,7 +15,7 @@
             [frontend.worker.handler.page :as worker-page]
             [frontend.worker.handler.page.file-based.rename :as file-worker-page-rename]
             [frontend.worker.handler.page.db-based.rename :as db-worker-page-rename]
-            [frontend.worker.rtc.core2 :as rtc-core2]
+            [frontend.worker.rtc.core :as rtc-core]
             [frontend.worker.rtc.db-listener]
             [frontend.worker.rtc.op-mem-layer :as op-mem-layer]
             [frontend.worker.search :as search]
@@ -597,15 +597,15 @@
   (rtc-start2
    [this repo token]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--rtc-start repo token))))
+     (js/Promise. (rtc-core/new-task--rtc-start repo token))))
 
   (rtc-stop2
    [this]
-   (rtc-core2/rtc-stop))
+   (rtc-core/rtc-stop))
 
   (rtc-toggle-auto-push
    [this]
-   (rtc-core2/rtc-toggle-auto-push))
+   (rtc-core/rtc-toggle-auto-push))
 
   (rtc-grant-graph-access2
    [this token graph-uuid target-user-uuids-str target-user-emails-str]
@@ -613,71 +613,71 @@
          target-user-emails (ldb/read-transit-str target-user-emails-str)]
      (with-write-transit-str
        (js/Promise.
-        (rtc-core2/new-task--grant-access-to-others token graph-uuid
+        (rtc-core/new-task--grant-access-to-others token graph-uuid
                                                     :target-user-uuids target-user-uuids
                                                     :target-user-emails target-user-emails)))))
 
   (rtc-get-graphs2
    [this token]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--get-graphs token))))
+     (js/Promise. (rtc-core/new-task--get-graphs token))))
 
   (rtc-delete-graph2
    [this token graph-uuid]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--delete-graph token graph-uuid))))
+     (js/Promise. (rtc-core/new-task--delete-graph token graph-uuid))))
 
   (rtc-get-users-info2
    [this token graph-uuid]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--get-user-info token graph-uuid))))
+     (js/Promise. (rtc-core/new-task--get-user-info token graph-uuid))))
 
   (rtc-get-block-content-versions2
    [this token graph-uuid block-uuid]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--get-block-content-versions token graph-uuid block-uuid))))
+     (js/Promise. (rtc-core/new-task--get-block-content-versions token graph-uuid block-uuid))))
 
   (rtc-get-debug-state2
    [this]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--get-debug-state))))
+     (js/Promise. (rtc-core/new-task--get-debug-state))))
 
   (rtc-async-upload-graph2
    [this repo token remote-graph-name]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--upload-graph token repo remote-graph-name))))
+     (js/Promise. (rtc-core/new-task--upload-graph token repo remote-graph-name))))
 
   ;; ================================================================
   (rtc-request-download-graph
    [this token graph-uuid]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--request-download-graph token graph-uuid))))
+     (js/Promise. (rtc-core/new-task--request-download-graph token graph-uuid))))
 
   (rtc-wait-download-graph-info-ready
    [this token download-info-uuid graph-uuid timeout-ms]
    (with-write-transit-str
      (js/Promise.
-      (rtc-core2/new-task--wait-download-info-ready token download-info-uuid graph-uuid timeout-ms))))
+      (rtc-core/new-task--wait-download-info-ready token download-info-uuid graph-uuid timeout-ms))))
 
   (rtc-download-graph-from-s3
    [this graph-uuid graph-name s3-url]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--download-graph-from-s3 graph-uuid graph-name s3-url))))
+     (js/Promise. (rtc-core/new-task--download-graph-from-s3 graph-uuid graph-name s3-url))))
 
   (rtc-download-info-list
    [this token graph-uuid]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--download-info-list token graph-uuid))))
+     (js/Promise. (rtc-core/new-task--download-info-list token graph-uuid))))
 
   (rtc-snapshot-graph
    [this token graph-uuid]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--snapshot-graph token graph-uuid))))
+     (js/Promise. (rtc-core/new-task--snapshot-graph token graph-uuid))))
 
   (rtc-snapshot-list
    [this token graph-uuid]
    (with-write-transit-str
-     (js/Promise. (rtc-core2/new-task--snapshot-list token graph-uuid))))
+     (js/Promise. (rtc-core/new-task--snapshot-list token graph-uuid))))
 
   (undo
    [_this repo _page-block-uuid-str]
diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index 5f91d92272..36945694d2 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -2808,7 +2808,7 @@
 
 (defn indent-outdent
   [indent?]
-  (let [editor (state/get-input)
+  (let [_editor (state/get-input)
         {:keys [block]} (get-state)]
     (when block
       (block-handler/indent-outdent-blocks! [block] indent? save-current-block!))))
diff --git a/src/main/frontend/worker/rtc/client.cljs b/src/main/frontend/worker/rtc/client.cljs
index b99734ed03..c37a74eac9 100644
--- a/src/main/frontend/worker/rtc/client.cljs
+++ b/src/main/frontend/worker/rtc/client.cljs
@@ -7,7 +7,7 @@
             [frontend.worker.rtc.exception :as r.ex]
             [frontend.worker.rtc.op-mem-layer :as op-mem-layer]
             [frontend.worker.rtc.remote-update :as r.remote-update]
-            [frontend.worker.rtc.ws2 :as ws]
+            [frontend.worker.rtc.ws :as ws]
             [logseq.db :as ldb]
             [missionary.core :as m]))
 
diff --git a/src/main/frontend/worker/rtc/const.cljs b/src/main/frontend/worker/rtc/const.cljs
index 3552497ee7..a9f7dc96b5 100644
--- a/src/main/frontend/worker/rtc/const.cljs
+++ b/src/main/frontend/worker/rtc/const.cljs
@@ -192,7 +192,7 @@
      [:map
       [:req-id :string]
       [:action :string]
-      [:graph-uuid {:optional true} :uuid]]] ;TODO: remove optional
+      [:graph-uuid :uuid]]]
     ["delete-graph"
      [:map
       [:req-id :string]
diff --git a/src/main/frontend/worker/rtc/core2.cljs b/src/main/frontend/worker/rtc/core.cljs
similarity index 99%
rename from src/main/frontend/worker/rtc/core2.cljs
rename to src/main/frontend/worker/rtc/core.cljs
index b29c55952d..210d14e86a 100644
--- a/src/main/frontend/worker/rtc/core2.cljs
+++ b/src/main/frontend/worker/rtc/core.cljs
@@ -1,4 +1,4 @@
-(ns frontend.worker.rtc.core2
+(ns frontend.worker.rtc.core
   "Main(use missionary) ns for rtc related fns"
   (:require [frontend.common.missionary-util :as c.m]
             [frontend.worker.rtc.client :as r.client]
@@ -6,7 +6,7 @@
             [frontend.worker.rtc.full-upload-download-graph :as r.upload-download]
             [frontend.worker.rtc.op-mem-layer :as op-mem-layer]
             [frontend.worker.rtc.remote-update :as r.remote-update]
-            [frontend.worker.rtc.ws2 :as ws]
+            [frontend.worker.rtc.ws :as ws]
             [frontend.worker.state :as worker-state]
             [frontend.worker.util :as worker-util]
             [goog.string :as gstring]
diff --git a/src/main/frontend/worker/rtc/ws2.cljs b/src/main/frontend/worker/rtc/ws.cljs
similarity index 99%
rename from src/main/frontend/worker/rtc/ws2.cljs
rename to src/main/frontend/worker/rtc/ws.cljs
index 7365375fd5..3e251f03c2 100644
--- a/src/main/frontend/worker/rtc/ws2.cljs
+++ b/src/main/frontend/worker/rtc/ws.cljs
@@ -1,4 +1,4 @@
-(ns frontend.worker.rtc.ws2
+(ns frontend.worker.rtc.ws
   "Websocket wrapped by missionary.
   based on
   https://github.com/ReilySiegel/missionary-websocket/blob/master/src/com/reilysiegel/missionary/websocket.cljs"