Get rid of some old code