Remove a few less-useful mysql metrics, add a few that seem more useful