minor Metrics cleanup