diff --git a/docs/source/conf.py b/docs/source/conf.py
index 2b5cf9df..4f82adba 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -4,10 +4,6 @@ import os
 import shlex
 import sys
 
-import recommonmark.parser
-
-# For conversion from markdown to html
-
 # Set paths
 sys.path.insert(0, os.path.abspath('.'))
 
diff --git a/setup.py b/setup.py
index 898fc05f..21b5ab4a 100755
--- a/setup.py
+++ b/setup.py
@@ -10,6 +10,12 @@ from __future__ import print_function
 import os
 import shutil
 import sys
+from glob import glob
+from subprocess import check_call
+
+from setuptools import setup
+from setuptools.command.bdist_egg import bdist_egg
+
 
 v = sys.version_info
 if v[:2] < (3, 5):
@@ -23,14 +29,6 @@ if os.name in ('nt', 'dos'):
     warning = "WARNING: Windows is not officially supported"
     print(warning, file=sys.stderr)
 
-# At least we're on the python version we need, move on.
-
-import os
-from glob import glob
-from subprocess import check_call
-
-from setuptools import setup
-from setuptools.command.bdist_egg import bdist_egg
 
 pjoin = os.path.join