Remove (hopefully) superfluous TODOs

[ci skip]