misc Metrics cleanup