Removing unnecessary dependencies on snapshots