Remove some outdate TODO markers