Remove a few bits of dead code