C++11 removed (couple of lines)