Removed explicit hiera() function calls