Remove old references to SummaryMetrics

.. cleaning up from last few commits.