Remove more places uses _boost