Remove C++11 code

Change-Id: Ifa0a6bb1dcf2546f4ec11ff164311bd988ecacfa
Signed-off-by: Meggan Ehret <meggan@qeo.org>