Fixed dry_run simulation
Finally fixed snapshot retention