Remove need for -std=c++0x
Simplify and remove unused code