add todo, and remove dead comment