Remove Async.wait and add top level type signature