* Remove some unnecessary async/await * More not-so-async stuff * More not-so-async stuff * Fix merge issue