remove most of the c++11 code