Remove some old TODO notes