NXP-16090: cleaning import