Remove C++11 requirement