Rename metric and removed cruft