NXP-11070: cleanup imports