Async cleanup

**Short overview**
Refactor code to get rid of unnecessary `await`s or `Promise` wrapping.

**Use case**
Clean code

**Detailed description**

**Additional content**
> Please provide any (mandatory) additional data for your enhancement
