cleanup and fix mount snapshot dry_run