Remove dead TODOs and dead code