Removed message_set calls