Remove faulty overlay code and restore heatmap with markers