Removed s3 stuff