refactoring, removed heatmap elements