Code cleanup, temporarily disabled Config in MessageManager.