Remove some old TODO comments