Also remove dependency on puppet.conf