Remove unnecessary awaits to speed up cold startup time