diff --git a/wexpect/__init__.py b/wexpect/__init__.py
index 52e9661..9faec1c 100644
--- a/wexpect/__init__.py
+++ b/wexpect/__init__.py
@@ -9,51 +9,27 @@ except KeyError:
     spawn_class_name = 'legacy_wexpect'
 
 from .legacy_wexpect import ConsoleReader
-if spawn_class_name == 'legacy_wexpect':
-    from .legacy_wexpect import ExceptionPexpect
-    from .legacy_wexpect import EOF
-    from .legacy_wexpect import TIMEOUT
-    from .legacy_wexpect import spawn
-    from .legacy_wexpect import run
-    from .legacy_wexpect import split_command_line
-    from .legacy_wexpect import join_args
-    from .legacy_wexpect import ConsoleReader
-    from .legacy_wexpect import __version__
-    from .legacy_wexpect import searcher_string
-    from .legacy_wexpect import searcher_re
+        
 
-    __all__ = ['ExceptionPexpect', 'EOF', 'TIMEOUT', 'spawn', 'run', 'split_command_line',
-    '__version__', 'ConsoleReader', 'join_args', 'searcher_string', 'searcher_re']
+from .console_reader import ConsoleReaderSocket
+from .console_reader import ConsoleReaderPipe
+
+from .host import SpawnSocket
+from .host import SpawnPipe
+from .host import searcher_string
+from .host import searcher_re
+from .legacy_wexpect import join_args
+
+try:
+    spawn = globals()[spawn_class_name]
+except KeyError:
+    print(f'Error: no spawn class: {spawn_class_name}')
+    raise
     
-else:
-        
-    from .wexpect_util import split_command_line
-    from .wexpect_util import join_args
-    from .wexpect_util import ExceptionPexpect
-    from .wexpect_util import EOF
-    from .wexpect_util import TIMEOUT
-
-    from .console_reader import ConsoleReaderSocket
-    from .console_reader import ConsoleReaderPipe
-
-    from .host import SpawnSocket
-    from .host import SpawnPipe
-    from .host import run
-    from .host import searcher_string
-    from .host import searcher_re
+# The version is handled by the package: pbr, which derives the version from the git tags.
+try:
+    __version__ = pkg_resources.require("wexpect")[0].version
+except: # pragma: no cover
+    __version__ = '0.0.1.unkowndev0'
     
-    try:
-        spawn = globals()[spawn_class_name]
-    except KeyError:
-        print(f'Error: no spawn class: {spawn_class_name}')
-        raise
-        
-    # The version is handled by the package: pbr, which derives the version from the git tags.
-    try:
-        __version__ = pkg_resources.require("wexpect")[0].version
-    except: # pragma: no cover
-        __version__ = '0.0.1.unkowndev0'
-        
-    __all__ = ['split_command_line', 'join_args', 'ExceptionPexpect', 'EOF', 'TIMEOUT',
-           'ConsoleReaderSocket', 'ConsoleReaderPipe', 'spawn', 'SpawnSocket', 'SpawnPipe', 'run', 
-           'searcher_string', 'searcher_re', '__version__', 'ConsoleReader']
+__all__ = ['ConsoleReaderSocket', 'ConsoleReaderPipe', 'spawn', 'SpawnPipe', 'ConsoleReader', 'join_args']