fixed cleanup, added zookeeper partitioning