get rid of the Message class