Simplify schedulers.
Refactor schedulers, remove schedulers, use generic scheduler.
Merge pull request #1449 from brendandburns/scheduler

Refactor scheduler, use generic scheduler everywhere, delete old code.