Removed the tunnelbroker stuff from this branch