NXP-15053: cleanup