Some heat map cleanup