fully remove s3 support