The refactored code did not work with async code, and decision was taken to get the code in a working state first. Later we can look at cleaning it up.
The code is no longer in async mode, so time to look at if we can refactor it again.
Also, need to add unit test cases