Removing S3 model and test, we are not ready to release.  Adding redshift.