cleanups
fix Scheduler FSM