Remove MetricItem dependency