Minor tweek to removeUnitsFromZeroValues