NXP-14902: cleanup