cleanup && added template for s3 deploy