Cleaned up message handler configuration.