[CHG± code cleanup