Preliminary removal of heatmaps support