Remove some more dead code.

Resolves #590.

This was just an opportunistic zapping.  There's almost certainly more dead code floating around, but returns from hunting it down are diminishing.