Adding zookeeper S3 cleanup