Deleted unused elements, added heatmapping