Removed unnecessary async/await in a few places