Cleanup for validation script