Remove some obsolete TODO comments.