Remove duplicate task instantiation