remove some more dead code