Remove C++11 feature