Eliminated the C++11 dependancy