removed some newly dead code