Pull out old message create code.
Finish cleaning out old message creation.