Added cleaning of generated YAML