Remove some more useless code.