remove some now-dead code