Fix 6, remove code & dependency to `s3`.