Metrics cleanup

Remove code that doesn't match the current plans.

Correct typos.

Reduce construction of huge strings where possible.
Merge pull request #2 from ncdc/metrics

Metrics cleanup