Removing snapshot dependencies