Removed TODO about S3.