Removing C++11 dependency