Remove dead code
Remove TODO comment and dead code
Remove TODO comments that are way of improvement, not unfinished code