New Snapshot, general cleanup