Remove some dead code.

Some of it I made dead.