Remove all use of asynchronous invocation after moving to one query per job