Changes to remove snapshot