NXP-11557: cleanup