NXP-11631: cleanup