cleanup, updates, initial drop for SingleSnapshotMap