                          (map second))
           new-remaining (sequence offer-xf (:remaining barrier))]
       (if (empty? new-remaining)
-        (-> state 
-            (assoc :checkpoint-version nil)
-            (update :barrier merge {:remaining nil
-                                    :offering? false}))   
+        (update state :barrier merge {:remaining nil
+                                      :offering? false})   
         (do
          ;; sleep for two milliseconds before retrying the offer
          (LockSupport/parkNanos (* 2 1000000))

                                        :remaining (m/publishers new-messenger)
                                        :opts {:recover-coordinates coordinates}})
                (update :checkpoint merge {:epoch 0})
                (assoc :curr-replica new-replica
                       :messenger new-messenger)))

          :else
          (assoc state :curr-replica new-replica))))

          barrier-period-ns (ms->ns (arg-or-default :onyx.peer/coordinator-barrier-period-ms peer-config))
          heartbeat-ns (ms->ns (arg-or-default :onyx.peer/heartbeat-ms peer-config))
          result (loop [state (initialise-state state)]
                   (if-let [scheduler-event (poll! shutdown-ch)]
                     (do (shutdown (assoc state :scheduler-event scheduler-event))
                         :shutdown)
