c++11 flag cleanup