Changed task to get rid of dependencies