Removed c++11 dependency