Removing the newer C++ features for compatability.