Updated for removing tasks