Removed refernces to heatmap