Update to new l2met format

Should also save $$ as additional metrics won't be generated.