Finished conversion to async.auto