[tor-commits] [sbws/master] Remove some unused code