NXP-15341: cleanup