small cleanup + zookeeper does not crash in dev profile if you have none