NXP-13793: cleanup