Simplify the scheduler