Remove a few more c++ 11 features