NXP-15222: cleanup