Merge "Remove some obsolete TODO comments."