Remove IFUnitGroup, re-design IFGroup