remove comments in message wrapper class