removed some more dead code