NXP-11618: cleanup