Refactor. Remove uncalled functions in MetricPoint