Scheduler unused code cleanup