Removed dependency on two boost libraries