#31: heatmap cleanup