Remove duplication of tasks