Drop use of ClusteredDataTreeChangeLister