diff --git a/kiva/agg/src/agg_std_string.i b/kiva/agg/src/agg_std_string.i
index 416f271e7..458f5d033 100644
--- a/kiva/agg/src/agg_std_string.i
+++ b/kiva/agg/src/agg_std_string.i
@@ -18,12 +18,10 @@
   {
     $1 = new std::string((char *)PyBytes_AsString($input));
   }
-#if PY_VERSION_HEX >= 0x03030000
   else if (PyUnicode_Check($input))
   {
     $1 = new std::string((char *)PyUnicode_AsUTF8($input));
   }
-#endif
   else
   {
     PyErr_SetString (PyExc_TypeError, "not a String");
diff --git a/kiva/agg/src/agg_typemaps.i b/kiva/agg/src/agg_typemaps.i
index 4efb4a3a9..ca0a948c7 100644
--- a/kiva/agg/src/agg_typemaps.i
+++ b/kiva/agg/src/agg_typemaps.i
@@ -353,18 +353,10 @@
   {
     $1 = (char *)PyBytes_AsString($input);
   }
-#if PY_VERSION_HEX >= 0x03030000
   else if (PyUnicode_Check($input))
   {
     $1 = (char *)PyUnicode_AsUTF8($input);
   }
-#elif PY_VERSION_HEX < 0x03000000
-  else if (PyUnicode_Check($input))
-  {
-    utfstr = PyUnicode_AsUTF8String($input);
-    $1 = (char *)PyString_AsString(utfstr);
-  }
-#endif
   else
   {
     PyErr_SetString(PyExc_TypeError, "not a string");
diff --git a/kiva/agg/src/win32/plat_support.i b/kiva/agg/src/win32/plat_support.i
index ce2ce8a18..46c89550c 100644
--- a/kiva/agg/src/win32/plat_support.i
+++ b/kiva/agg/src/win32/plat_support.i
@@ -61,11 +61,7 @@ namespace agg24
 // unsigned value.  It is cleared at the end of this file.
 %typemap(in) unsigned
 {
-%#if PY_VERSION_HEX < 0x03000000
-    PyObject* obj = PyNumber_Int($input);
-%#else
     PyObject* obj = PyNumber_Long($input);
-%#endif
     if (PyErr_Occurred()) SWIG_fail;
     $1 = (unsigned) PyLong_AsLong(obj);
     if (PyErr_Occurred()) SWIG_fail;
diff --git a/kiva/gl/__init__.py b/kiva/gl/__init__.py
index 380d82fd9..89ff620f8 100644
--- a/kiva/gl/__init__.py
+++ b/kiva/gl/__init__.py
@@ -7,8 +7,6 @@
 # is also available online at http://www.enthought.com/licenses/BSD.txt
 #
 # Thanks for using Enthought open source!
-from __future__ import absolute_import, print_function
-
 import ctypes
 from math import floor
 import sys
diff --git a/kiva/gl/src/swig/agg_std_string.i b/kiva/gl/src/swig/agg_std_string.i
index fb5de06c0..0f31551c8 100644
--- a/kiva/gl/src/swig/agg_std_string.i
+++ b/kiva/gl/src/swig/agg_std_string.i
@@ -19,12 +19,10 @@
     {
         $1 = new std::string((char *)PyBytes_AsString($input));
     }
-#if PY_VERSION_HEX >= 0x03030000
     else if (PyUnicode_Check($input))
     {
         $1 = new std::string((char *)PyUnicode_AsUTF8($input));
     }
-#endif
     else
     {
         PyErr_SetString (PyExc_TypeError, "not a String");
diff --git a/setup.py b/setup.py
index 16a6b3feb..13ca829f8 100644
--- a/setup.py
+++ b/setup.py
@@ -388,7 +388,7 @@ def macos_extensions():
     for framework in frameworks:
         extra_link_args.extend(['-framework', framework])
 
-    return[
+    return [
         Extension(
             'kiva.quartz.ABCGI',
             sources=[