NXP-13793: remove comments