Remove two cleanups using std::string