Redudant TODO removed