Get rid of dead code