[PATCH 4/5] remove unused std::map and std::string