Remove non-relevant anymore TODO.