Remove tasks fix