Remove the dependance on Boost