NXP-12594 cleanup