Remove accumulating, clean up initial sync