NXP-14879: clean