removed redundant fields from the message parsing