Merge "Remove a redundant cleanup_snapshot method"