YAML cleanup