Cleanup --dry-run option code