Cleaning up hiera