Cleanup heatmap code and includes