More code removal.