Merge "SF: Clean up Scheduler"