Clean up scheduler code

Nicolas Fellarequested to merge
work/nico/scheduler-cleanup into master

See commits

Merge request reports