Remove (hopefully) superfluous TODOs