diff --git a/tools/release b/tools/release
index 78f1805..017f553 100755
--- a/tools/release
+++ b/tools/release
@@ -51,17 +51,19 @@ if 'upload' not in sys.argv:
     sys.exit(0)
 
 # Register with the Python Package Index (PyPI)
-print( 'Registering with PyPI...')
+print( 'Not Registering with PyPI, registering with setup.py is insecure as communication is not encrypted')
 cd(ipdir)
-sh('./setup.py register')
+# sh('./setup.py register')
 
 # Upload all files
-sh(sdists + ' upload')
+sh(sdists)
 for py in ('2.7', '3.4'):
-    sh('python%s setupegg.py bdist_wheel upload' % py)
+    sh('python%s setupegg.py bdist_wheel' % py)
+
+print('Will not upload with setuptools as upload connection is insecure. Please use `twine upload dist/*` to upload the files to PyPI')
 
 cd(distdir)
-print( 'Uploading distribution files...')
+print( 'Uploading distribution files to GitHub...')
 
 for fname in os.listdir('.'):
     # TODO: update to GitHub releases API
@@ -71,6 +73,7 @@ for fname in os.listdir('.'):
     post_download("ipython/ipython", fname, description=desc)
 
 # Make target dir if it doesn't exist
+print('Uploading IPython to backup site.')
 sh('ssh %s "mkdir -p %s/release/%s" ' % (archive_user, archive_dir, version))
 sh('scp * %s' % release_site)
 
diff --git a/tools/toollib.py b/tools/toollib.py
index 48028e9..020560b 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -4,7 +4,6 @@ from __future__ import print_function
 
 # Library imports
 import os
-import sys
 
 # Useful shorthands
 pjoin = os.path.join