NXP-10781: cleanup import