Dupilcate TODO removed