Removed dependency of C++11