Cleanup YAML and Puppet config file mess