Clean-up
PDIO-127 Add MetricInfo