JAH-210 Removed aggregate_metrics