REFACTOR: boost version
CLEANUP