remove commented S3-related code for now