Remove some TODO comments.