Removed s3 stuff again, doens't belong here.