Remove Excessive C++11isms