Removing more S3 things [skip ci]