commenting out s3 stuff for the moment