Remove hiera references