         (when callback
           (reset! assignments-callback callback))
         (or (keys @assignments) []))
-;        (get-children cluster-state ASSIGNMENTS-SUBTREE (not-nil? callback)))
 
       (assignment-info
         [this storm-id callback]
         (when callback
           (swap! assignment-info-callback assoc storm-id callback))
         (@assignments storm-id))
-;        (maybe-deserialize (get-data cluster-state (assignment-path storm-id) (not-nil? callback))))
 
       (active-storms
         [this]
         ;; Return storm ids that are running
         ;; or empty if none are running.
-        (or (keys @active-storms-map) []))
+        (or (keys @active-storms) []))
 
       (activate-storm!
         [this storm-id storm-base]
         ; Map the storm id to StormBase in active map
-        (swap! active-storms-map assoc storm-id storm-base))
+        (swap! active-storms assoc storm-id storm-base))
 
       (update-storm!
         [this storm-id new-elems]

              executors (:component->executors base)
              ;; new-elems' :component->executors map is updated with merge
              new-elems (update new-elems :component->executors (partial merge executors))]
          (swap! active-storms-map assoc storm-id (-> base (merge new-elems)))))

      (storm-base
        [this storm-id callback]

  (set-assignment! [this storm-id info]))


(defn mk-storm-cluster-state
  "Make state for one instance of a 'storm'."
  [conf]
  (let [
        assignment-info-callback (atom {})
        assignments-callback (atom nil)
        storm-base-callback (atom {})
        ;; store active storms in a map
        active-storms (atom {})
        assignments (atom {})
        state-id (uuid)]
    (reify
      StormClusterState
