NXP-14008: Cleaning interfaces