Remove dependency to C++ 11