AJ-1573 Improving metric badge deletion