c++11 cleanup