removed unnecessary message field

- removed unnecesary message field, improve coupling