Trying to fix and remove Amazon S3 again