Update metrics definition tables, clean up installation section