NXP-10907 more cleanup