Yaml cleanup