wip
Remove await keyword