Clean-up some YAML