removed TODO
removed useless code