Dependencies + remove useless tasks