Remove the todo is not a issue anymore