removing _boost, first pass