diff --git a/IPython/kernel/channelabc.py b/IPython/kernel/channelabc.py
index 608d4db..b25f80c 100644
--- a/IPython/kernel/channelabc.py
+++ b/IPython/kernel/channelabc.py
@@ -125,69 +125,3 @@ class HBChannelABC(ChannelABC):
     def is_beating(self):
         pass
 
-
-#-----------------------------------------------------------------------------
-# Main kernel manager class
-#-----------------------------------------------------------------------------
-
-class KernelClientABC(object):
-    """KernelManager ABC.
-
-    The docstrings for this class can be found in the base implementation:
-
-    `IPython.kernel.channels.KernelClient`
-    """
-
-    __metaclass__ = abc.ABCMeta
-
-    @abc.abstractproperty
-    def kernel(self):
-        pass
-
-    @abc.abstractproperty
-    def shell_channel_class(self):
-        pass
-
-    @abc.abstractproperty
-    def iopub_channel_class(self):
-        pass
-
-    @abc.abstractproperty
-    def hb_channel_class(self):
-        pass
-
-    @abc.abstractproperty
-    def stdin_channel_class(self):
-        pass
-
-    #--------------------------------------------------------------------------
-    # Channel management methods
-    #--------------------------------------------------------------------------
-
-    @abc.abstractmethod
-    def start_channels(self, shell=True, iopub=True, stdin=True, hb=True):
-        pass
-
-    @abc.abstractmethod
-    def stop_channels(self):
-        pass
-
-    @abc.abstractproperty
-    def channels_running(self):
-        pass
-
-    @abc.abstractproperty
-    def shell_channel(self):
-        pass
-
-    @abc.abstractproperty
-    def iopub_channel(self):
-        pass
-
-    @abc.abstractproperty
-    def stdin_channel(self):
-        pass
-
-    @abc.abstractproperty
-    def hb_channel(self):
-        pass
diff --git a/IPython/kernel/clientabc.py b/IPython/kernel/clientabc.py
index 0dcc956..a4c9580 100644
--- a/IPython/kernel/clientabc.py
+++ b/IPython/kernel/clientabc.py
@@ -1,4 +1,4 @@
-"""Abstract base classes for kernel clients and channels"""
+"""Abstract base class for kernel clients"""
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2013  The IPython Development Team
@@ -15,119 +15,7 @@
 import abc
 
 #-----------------------------------------------------------------------------
-# Channels
-#-----------------------------------------------------------------------------
-
-
-class ChannelABC(object):
-    """A base class for all channel ABCs."""
-
-    __metaclass__ = abc.ABCMeta
-
-    @abc.abstractmethod
-    def start(self):
-        pass
-
-    @abc.abstractmethod
-    def stop(self):
-        pass
-
-    @abc.abstractmethod
-    def is_alive(self):
-        pass
-
-
-class ShellChannelABC(ChannelABC):
-    """ShellChannel ABC.
-
-    The docstrings for this class can be found in the base implementation:
-
-    `IPython.kernel.kernelmanager.ShellChannel`
-    """
-
-    @abc.abstractproperty
-    def allow_stdin(self):
-        pass
-
-    @abc.abstractmethod
-    def execute(self, code, silent=False, store_history=True,
-                user_variables=None, user_expressions=None, allow_stdin=None):
-        pass
-
-    @abc.abstractmethod
-    def complete(self, text, line, cursor_pos, block=None):
-        pass
-
-    @abc.abstractmethod
-    def object_info(self, oname, detail_level=0):
-        pass
-
-    @abc.abstractmethod
-    def history(self, raw=True, output=False, hist_access_type='range', **kwargs):
-        pass
-
-    @abc.abstractmethod
-    def kernel_info(self):
-        pass
-
-    @abc.abstractmethod
-    def shutdown(self, restart=False):
-        pass
-
-
-class IOPubChannelABC(ChannelABC):
-    """IOPubChannel ABC.
-
-    The docstrings for this class can be found in the base implementation:
-
-    `IPython.kernel.kernelmanager.IOPubChannel`
-    """
-
-    @abc.abstractmethod
-    def flush(self, timeout=1.0):
-        pass
-
-
-class StdInChannelABC(ChannelABC):
-    """StdInChannel ABC.
-
-    The docstrings for this class can be found in the base implementation:
-
-    `IPython.kernel.kernelmanager.StdInChannel`
-    """
-
-    @abc.abstractmethod
-    def input(self, string):
-        pass
-
-
-class HBChannelABC(ChannelABC):
-    """HBChannel ABC.
-
-    The docstrings for this class can be found in the base implementation:
-
-    `IPython.kernel.kernelmanager.HBChannel`
-    """
-
-    @abc.abstractproperty
-    def time_to_dead(self):
-        pass
-
-    @abc.abstractmethod
-    def pause(self):
-        pass
-
-    @abc.abstractmethod
-    def unpause(self):
-        pass
-
-    @abc.abstractmethod
-    def is_beating(self):
-        pass
-
-
-#-----------------------------------------------------------------------------
-# Main kernel manager class
+# Main kernel client class
 #-----------------------------------------------------------------------------
 
 class KernelClientABC(object):
@@ -135,7 +23,7 @@ class KernelClientABC(object):
 
     The docstrings for this class can be found in the base implementation:
 
-    `IPython.kernel.kernelmanager.KernelClient`
+    `IPython.kernel.client.KernelClient`
     """
 
     __metaclass__ = abc.ABCMeta