deleted extra unused fields from message