NXP-16240: cleanup