Pull in change from api-js (asyncification) + remove extraneous calls