removed TODO of already taken care issue