diff --git a/common/test/common_tests/types/tokens_lib_test.cljc b/common/test/common_tests/types/tokens_lib_test.cljc
index 5d14c90cbb..67fd9c105f 100644
--- a/common/test/common_tests/types/tokens_lib_test.cljc
+++ b/common/test/common_tests/types/tokens_lib_test.cljc
@@ -258,11 +258,10 @@
                           (ctob/delete-set-path "S-not-existing-set"))
 
           token-set'  (ctob/get-set tokens-lib' "updated-name")
-          ;;token-theme'  (ctob/get-theme tokens-lib' "" "test-token-theme")
-          ]
+          token-theme'  (ctob/get-theme tokens-lib' "" "test-token-theme")]
 
       (t/is (= (ctob/set-count tokens-lib') 0))
-      ;; (t/is (= (:sets token-theme') #{}))  TODO: fix this
+      (t/is (= (:sets token-theme') #{}))
       (t/is (nil? token-set'))))
 
   (t/deftest active-themes-set-names
diff --git a/frontend/src/app/main/data/tokens.cljs b/frontend/src/app/main/data/tokens.cljs
index 1700335b51..d0bbc890b5 100644
--- a/frontend/src/app/main/data/tokens.cljs
+++ b/frontend/src/app/main/data/tokens.cljs
@@ -68,14 +68,6 @@
       (->> (ctob/set-name-string->prefixed-set-path-string token-set-name)
            (wtts/assoc-selected-token-set-path state)))))
 
-(defn set-selected-token-set-id-from-name
-  [token-set-name]
-  (ptk/reify ::set-selected-token-set-id-from-name
-    ptk/UpdateEvent
-    (update [_ state]
-      (->> (ctob/set-name->set-path-string token-set-name)
-           (wtts/assoc-selected-token-set-path state)))))
-
 (defn create-token-theme [token-theme]
   (let [new-token-theme token-theme]
     (ptk/reify ::create-token-theme