NXP-14226: clean up