NXP-14507: cleanup