fixed some derps, removed dead metrics