more cleanup - make this portable (i.e. illumina-specific stuff is limited to hiera parameters