Remove some dead code

These are bits I missed while fixing #767 .