Clean up Scheduler

Undo some of the unreviewed changes to Scheduler, but keep the rewire removal.