Get rid of some dead code