Removed c++11 features