removed unnecessary Tasks