Final cleanup on puppet-generic.conf