Remove the dependence to boost