Badge / Metric cleanup