fix(all): simplify using promises