removed more ZK and metrics stuff