NXP-14838: cleanup