Remove c++11 features