removed dependency on snapshots