NXP-15659: cleanup