Removing C++11 stuff