Removing Boost and going to c11