Remove more Amazon s3 config lines.