message.c cleanup