NXP-14979: cleanup