Remove unexported ondemand sets, and add one more sec to cortex loop.