Remove S3 dependency stuff.