NXP-15177: cleanup