Metrics cleanup