Remove dependency to collective.task