Removed c++11 conversions