CLDINT-1895: Cleanup the code related to the JobSchedulerService