major cleanup- remove old metrics code.