[PATCH 6/7] remove unused std::map and std::string