Remove kwargs. Modify S3 too.