Deleted JobOwnerAwaits and made some improvements in the refactoring