Remove dea deps and properly split tasks