NXP-11558 cleanup