:green_heart: Fix last failing tests
:fire: Remove asynchronous code wherever it is no longer required