add immutable snapshots back to chain state builder, cleanup