Fix Task Id and Remove function