Pruned outdated TODOs [ci skip]