Removing C++11 usage for SDK