Tidy up TimedMetric etc