NXP-9343: cleanup comments