Removed c++11 nonsense