removed useless todo statments.