Add hiera_config support and remove some unused cruft