matplotlib
diff --git a/‎lib/matplotlib/colorbar.py
Lines changed: 2 additions & 5 deletions b/‎lib/matplotlib/colorbar.py
Lines changed: 2 additions & 5 deletions
diff --git a/‎lib/matplotlib/figure.py
Lines changed: 13 additions & 15 deletions b/‎lib/matplotlib/figure.py
Lines changed: 13 additions & 15 deletions
diff --git a/‎lib/matplotlib/pyplot.py
Lines changed: 1 addition & 3 deletions b/‎lib/matplotlib/pyplot.py
Lines changed: 1 addition & 3 deletions
@@ -1163,11 +1163,8 @@ def set_alpha(self, alpha):
         self.alpha = alpha
 
     def remove(self):
-        """
-        Remove this colorbar from the figure.
-        """
-        fig = self.ax.figure
-        fig.delaxes(self.ax)
+        """Remove this colorbar from the figure."""
+        self.ax.remove()
 
 
 class Colorbar(ColorbarBase):
 
@@ -1021,16 +1021,6 @@ def set_frameon(self, b):
 
     frameon = property(get_frameon, set_frameon)
 
-    def delaxes(self, ax):
-        """
-        Remove the `~matplotlib.axes.Axes` *ax* from the figure and update the
-        current axes.
-        """
         self._axstack.remove(ax)
-        for func in self._axobservers:
-            func(self)
-        self.stale = True
-
     def add_artist(self, artist, clip=False):
         """
         Add any :class:`~matplotlib.artist.Artist` to the figure.
@@ -1366,10 +1356,10 @@ def add_subplot(self, *args, **kwargs):
             # add a red subplot that share the x-axis with ax1
             fig.add_subplot(224, sharex=ax1, facecolor='red')
 
-            #delete x2 from the figure
+            # delete x2 from the figure
             fig.delaxes(ax2)
 
-            #add x2 to the figure again
+            # add x2 to the figure again
             fig.add_subplot(ax2)
         """
         if not len(args):
@@ -1424,7 +1414,7 @@ def _add_axes_internal(self, key, ax):
         """Private helper for `add_axes` and `add_subplot`."""
         self._axstack.add(key, ax)
         self.sca(ax)
-        ax._remove_method = self._remove_ax
+        ax._remove_method = self.delaxes
         self.stale = True
         ax.stale_callback = _stale_figure_callback
         return ax
@@ -1597,7 +1587,11 @@ def subplots(self, nrows=1, ncols=1, sharex=False, sharey=False,
             # Returned axis array will be always 2-d, even if nrows=ncols=1.
             return axarr
 
-    def _remove_ax(self, ax):
+    def delaxes(self, ax):
+        """
+        Remove the `~.axes.Axes` *ax* from the figure; update the current axes.
+        """
+
         def _reset_locators_and_formatters(axis):
             # Set the formatters and locators to be associated with axis
             # (where previously they may have been associated with another
@@ -1639,7 +1633,11 @@ def _break_share_link(ax, grouper):
                         return last_ax
             return None
 
-        self.delaxes(ax)
+        self._axstack.remove(ax)
+        for func in self._axobservers:
+            func(self)
+        self.stale = True
+
         last_ax = _break_share_link(ax, ax._shared_y_axes)
         if last_ax is not None:
             _reset_locators_and_formatters(last_ax.yaxis)
 
@@ -828,12 +828,10 @@ def axes(arg=None, **kwargs):
 def delaxes(ax=None):
     """
     Remove the `Axes` *ax* (defaulting to the current axes) from its figure.
-
-    A KeyError is raised if the axes doesn't exist.
     """
     if ax is None:
         ax = gca()
-    ax.figure.delaxes(ax)
+    ax.remove()
 
 
 def sca(ax):