Puppet manifest cleanup