Remove some dead code.
Remove more code.