Cleanup of Messenger.c