Remove portability we are now a C++11 shop