message.h TODO removed.