Remove tor
Clean up
Fix address