Took out Amazon S3 imports