refactor/cleanup/update.  remove boost dep.