Removing c++11 code