NXP-11613: cleanup