Improve KPI definition UX
Remove unused columns
higher?