more Metrics cleanup

I guess I didn't need this stuff, either!