diff --git a/ioflo/aid/optimizing.py b/ioflo/aid/optimizing.py

index 544451e..a30fc62 100644

--- a/ioflo/aid/optimizing.py

+++ b/ioflo/aid/optimizing.py

@@ -49,7 +49,7 @@ foo = optimize._make_constants(foo)

 OPTIMIZE = True

-from types import FunctionType, ClassType

+from types import FunctionType

 from opcode import opmap, HAVE_ARGUMENT, EXTENDED_ARG

 if OPTIMIZE:

     globals().update(opmap)

@@ -184,7 +184,7 @@ def bind_all(mc, builtin_only=False, stoplist=[],  verbose=False):

         elif type(v) is FunctionType:

             newv = _make_constants(v, builtin_only, stoplist,  verbose)

             setattr(mc, k, newv)

-        elif type(v) in (type, ClassType):

+        elif type(v) in (type, type(type)):

             bind_all(v, builtin_only, stoplist, verbose)

 if not OPTIMIZE:

diff --git a/ioflo/aio/test/_test_httping_w_ext_server.py b/ioflo/aio/test/_test_httping_w_ext_server.py

index 475a346..76d7375 100644

--- a/ioflo/aio/test/_test_httping_w_ext_server.py

+++ b/ioflo/aio/test/_test_httping_w_ext_server.py

@@ -28,16 +28,14 @@ from ioflo.aid.sixing import *

 from ioflo.aid.odicting import odict

 #from ioflo.test import testing

-from ioflo.aio import nonblocking

-from ioflo.aid import httping

+from ioflo.base import nonblocking

+from ioflo.aio.http import httping

 from ioflo.aid.timing import Timer

 from ioflo.aid.consoling import getConsole

 console = getConsole()

-from ioflo.aid import httping

-

 def setUpModule():

     console.reinit(verbosity=console.Wordage.concise)

diff --git a/ioflo/aio/test/_test_tls_w_ext_serverclient.py b/ioflo/aio/test/_test_tls_w_ext_serverclient.py

index c2335c1..695e9fa 100644

--- a/ioflo/aio/test/_test_tls_w_ext_serverclient.py

+++ b/ioflo/aio/test/_test_tls_w_ext_serverclient.py

@@ -18,7 +18,7 @@ from ioflo.aid.sixing import *

 from ioflo.aid.consoling import getConsole

 console = getConsole()

-from ioflo.aio import nonblocking

+from ioflo.base import nonblocking

 def setUpModule():

     console.reinit(verbosity=console.Wordage.concise)

diff --git a/setup.py b/setup.py

index 7e659d0..d2fe9d5 100644

--- a/setup.py

+++ b/setup.py

@@ -72,7 +72,7 @@ setup(

                   'app/plan/*.txt', 'app/plan/*/*.txt',],},

     install_requires=[],

     python_requires='>=3.7.4',

-    setup_requires=["setuptools_git >= 1.1", ],

+    # setup_requires=["setuptools_git >= 1.1", ],

     extras_require={},

     scripts=['scripts/ioflo', 'scripts/ioflo3',],)

-- 

2.24.1