Added todo, removed dead code