NXP-12428: cleanup