Added s3
fixed remove error