fix remaining issues from removing Scheduler