cleanup & refactor async builder (all working)

...and removed lodash dependency