Remove s3 storage for more research