removed more c++11 features