Remove ugly sync holder + more refactoring to async/await. This probably breaks the server.