Merge "Remove setting some of the scheduler settings"