diff --git a/Dockerfile b/Dockerfile
index 0de9bdb..15f7f1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,10 +21,6 @@ RUN apt-get update \
 	g++ \
 	gcc \
 	make \
-	python-pip \
-	python-mysqldb \
-	python-dev \
-	python-imaging \
 	python3-pip \
 	python3-mysqldb \
 	python3-dev \
@@ -44,11 +40,9 @@ RUN apt-get update \
 	&& locale-gen en_US.UTF-8 \
 	&& update-locale \
     && pip3 install gunicorn \
-    && pip install setuptools \
     && pip3 install setuptools \
-    && pip install -r /requirements.txt \
     && pip3 install -r /requirements.txt \
-    && apt-get purge -y autoconf g++ make python-dev python3-dev libjpeg-dev libmariadbclient-dev \
+    && apt-get purge -y autoconf g++ make python3-dev libjpeg-dev libmariadbclient-dev \
 	&& apt-get autoremove -y \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& apt-get clean
diff --git a/README.devel b/README.devel
index b535304..26e5792 100644
--- a/README.devel
+++ b/README.devel
@@ -22,9 +22,8 @@ In order to run this application standalone, you will need:
   have to have Django installed, have the same or similar configuration
   in settings.py and have access to the database used by the web
   application):
-  * Python 2.7.6+ / Python 3.4+ to match with the version of BitBake
-    for the OpenEmbedded branch being parsed (for modern versions it's
-    Python 3.)
+  * Python 3.4+ to match with the version of BitBake for the OpenEmbedded 
+    branch being parsed.
   * Python dependencies as per requirements.txt (we still need Django
     etc. here since we interact with the database through Django's ORM.)
 
diff --git a/layerindex/bulkchange.py b/layerindex/bulkchange.py
index 3d1ee2b..d860c24 100644
--- a/layerindex/bulkchange.py
+++ b/layerindex/bulkchange.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # layerindex-web - bulk change implementation
 #
diff --git a/layerindex/tools/site_name.py b/layerindex/tools/site_name.py
index 836a0c1..ac78a63 100755
--- a/layerindex/tools/site_name.py
+++ b/layerindex/tools/site_name.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Updates site name in Django database
 #
diff --git a/layerindex/tools/update_classic_status.py b/layerindex/tools/update_classic_status.py
index 4edfc75..69b2960 100755
--- a/layerindex/tools/update_classic_status.py
+++ b/layerindex/tools/update_classic_status.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Update cover info for OE-Classic / other distro recipes in OE layer index database
 #
diff --git a/layerindex/update.py b/layerindex/update.py
index e2aa96e..ebe2543 100755
--- a/layerindex/update.py
+++ b/layerindex/update.py
@@ -454,8 +454,8 @@ def main():
 
                     if not options.nocheckout:
                         # We need to check this out because we're using stuff from bb.utils
-                        # below, and if we don't it might be a python 2 revision which would
-                        # be an issue
+                        # below, and if we don't then whatever is currently checked out might
+                        # be something incompatible
                         utils.checkout_repo(bitbakepath, safe_bitbake_branch, logger=logger)
 
                     deps_dict = utils.explode_dep_versions2(bitbakepath, deps)
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 1e5950c..525401f 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Update layer index database for a single layer
 #