[tor-commits] [tor/master] remove some (confusing) dead code