NXP-11558 Code cleanup