Removed todo from MessageSender