Removed s3 completely