Removed check for C++11