2nd attempt at riak and zookeeper removal