Simplifying the s3 storage interface.

I removed all of the logic not associated with getting/putting objects
in s3.