data listing cleanup