More dead code removal.