Fixed KPI deletion