Remove some now-dead code.