Metrics revamp: removes and adds some metrics