Removed most C++11 features