Get rid of old numeric analytics, make everything use the new ones.  Make sure the new ones pass all the tests the old ones had.