DataChangeListener cleanup