miscelaneous cleanup for the unification of classical schedulers