Further simplification in leafscheduler