some cleanup for snapshots