Wip: remove boost from code