diff --git a/deps/db/src/logseq/db.cljs b/deps/db/src/logseq/db.cljs
index df7f15786f..c4f1f39399 100644
--- a/deps/db/src/logseq/db.cljs
+++ b/deps/db/src/logseq/db.cljs
@@ -479,10 +479,7 @@
              (when-not (hidden-or-internal-tag? e)
                e))))))
 
-(defn built-in?
-  "Built-in page or block"
-  [entity]
-  (:logseq.property/built-in? entity))
+(def built-in? entity-util/built-in?)
 
 (defn built-in-class-property?
   "Whether property a built-in property for the specific class"
diff --git a/deps/db/src/logseq/db/frontend/entity_util.cljs b/deps/db/src/logseq/db/frontend/entity_util.cljs
index dfde39f763..f01ad9f464 100644
--- a/deps/db/src/logseq/db/frontend/entity_util.cljs
+++ b/deps/db/src/logseq/db/frontend/entity_util.cljs
@@ -81,3 +81,8 @@
                      :logseq.class/Whiteboard :whiteboard
                      :logseq.class/Page :page}]
     (set (map #(ident->type (:db/ident %)) (:block/tags entity)))))
+
+(defn built-in?
+  "Built-in page or block"
+  [entity]
+  (:logseq.property/built-in? entity))
diff --git a/deps/db/src/logseq/db/frontend/view.cljs b/deps/db/src/logseq/db/frontend/view.cljs
index e17de2ac18..d1492bf3d6 100644
--- a/deps/db/src/logseq/db/frontend/view.cljs
+++ b/deps/db/src/logseq/db/frontend/view.cljs
@@ -216,7 +216,9 @@
       :all-pages
       (keep (fn [d]
               (let [e (d/entity db (:e d))]
-                (when-not (hidden-or-internal-tag? e)
+                (when-not (or (hidden-or-internal-tag? e)
+                              (entity-util/property? e)
+                              (entity-util/built-in? e))
                   e)))
             (d/datoms db :avet property-ident))
       :class-objects
diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs
index a343ebd3fc..5439408ad1 100644
--- a/src/main/frontend/db/model.cljs
+++ b/src/main/frontend/db/model.cljs
@@ -838,14 +838,6 @@ independent of format as format specific heading characters are stripped"
        (:block/_tags class))
      (remove ldb/hidden?))))
 
-(defn sub-class-objects
-  [repo class-id]
-  (when class-id
-    (-> (react/q repo [:frontend.worker.react/objects class-id]
-                 {:query-fn (fn [_] (get-class-objects repo class-id))}
-                 nil)
-        react)))
-
 (defn get-property-related-objects
   [repo property-id]
   (when-let [property (db-utils/entity repo property-id)]