start removing the s3 specific stuff