Remove C++11 constructs