remove the use of C++0x features