Replace/consolidate more scheduled tasks with executors