Removal of not needed awaits