Merge "Removing unused counters." into main