Remove some c++11-syntax