Removed a ton of bad code from the S3 StorageType.  Now, we need to replace it with good code (if necessary).