various cleanup and make sure everything works with puppetdb