setup.yaml: Clean up