Some dead code removal.