Remove some long-dead code