heatmap witness list cleanup