Updated TODO and removed the batch request.