Metric cleanup