finished removing c++11