Remove redundant normalize_unit function