removing message_store_cpp_client from message_store_map_switcher