Merge "SF: Remove dead code from Scheduler" into main