Do some C++11 clean up.
Remove some functions.