Remove some more dead code