Remove C++11 features