removing s3 storage from mainstream