Scheduler code cleanup