diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
index 37c4d6588..44666cb6d 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
@@ -200,13 +200,9 @@
            context]
     :as _props}]
   (let [{:keys [editing? new? on-edit on-create on-reset] :as ctx} (or context (sets-context/use-context))
-        avoid-token-set-grouping #(str/replace % "/" "-")
         submit-token
         #(do
-           ;; TODO: We don't support set grouping for now so we rename sets for now
-           (when (str/includes? (:name %) "/")
-             (warn-on-try-create-token-set-group!))
-           (on-create-token-set (update % :name avoid-token-set-grouping))
+           (on-create-token-set %)
            (on-reset))]
     [:ul {:class (stl/css :sets-list)}
      (if (and
@@ -218,10 +214,7 @@
          (when token-set
            (let [update-token
                  #(do
-                  ;; TODO: We don't support set grouping for now so we rename sets for now
-                    (when (str/includes? (:name %) "/")
-                      (warn-on-try-create-token-set-group!))
-                    (on-update-token-set (avoid-token-set-grouping (:name token-set)) (update % :name avoid-token-set-grouping))
+                    (on-update-token-set (:name token-set) %)
                     (on-reset))]
              [:& sets-tree
               {:key (:name token-set)
diff --git a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
index 72771c4fa..e2c77d007 100644
--- a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs
@@ -182,8 +182,7 @@
   (->> data-stream
        (rx/map (fn [data]
                  (try
-                   (-> (str/replace data "/" "-") ;; TODO Remove when token groups work
-                       (t/decode-str))
+                   (t/decode-str data)
                    (catch js/Error e
                      (throw (wte/error-ex-info :error.import/json-parse-error data e))))))
        (rx/map (fn [json-data]