remove old s3 support