c++11 cleanups