Remove task calls
Split all task-settings