diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f2c1acade0..8c63911ec8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,25 +8,31 @@
             `Player.EventListener.onTimelineChanged(Timeline, int)` instead.
         *   `DefaultLoadControl` constructors. Use `DefaultLoadControl.Builder`
             instead.
+        *   `MappedTrackInfo.getTrackFormatSupport(int, int, int)`. Use
+            `MappedTrackInfo.getTrackSupport(int, int, int)`.
+        *   `MappedTrackInfo.getTrackTypeRendererSupport(int)`. Use
+            `MappedTrackInfo.getTypeSupport(int)`.
+        *   `MappedTrackInfo.getUnassociatedTrackGroups()`. Use
+            `MappedTrackInfo.getUnmappedTrackGroups()`.
+        *   `MappedTrackInfo.length` - Use `MappedTrackInfo.getRendererCount()`
+            instead.
         *   `PlayerView.setDefaultArtwork(Bitmap)`. Use
             `PlayerView.setDefaultArtwork(Drawable)` instead.
         *   `PlayerView.setShowBuffering(boolean)`. Use
             `PlayerView.setShowBuffering(int)` instead.
         *   `SimpleExoPlayer.clearVideoListener()`. Use
             `SimpleExoPlayer.removeVideoListener(VideoListener)` instead.
+        *   `SimpleExoPlayer.setAudioDebugListener(AudioRendererEventListener)`.
+            Use `SimpleExoPlayer.addAnalyticsListener(AnalyticsListener)`
+            instead.
+        *   `SimpleExoPlayer.setVideoDebugListener(VideoRendererEventListener)`.
+            Use `SimpleExoPlayer.addAnalyticsListener(AnalyticsListener)`
+            instead.
         *   `SimpleExoPlayer.setVideoListener(VideoListener)`. Use
             `SimpleExoPlayer.addVideoListener(VideoListener)` instead. If your
             application is calling `SimpleExoPlayer.setVideoListener(null)`,
             make sure to replace this call with
             `SimpleExoPlayer.removeVideoListener(VideoListener)`.
-        *   `MappedTrackInfo.length` - Use `MappedTrackInfo.getRendererCount()`
-            instead.
-        *   `MappedTrackInfo.getTrackTypeRendererSupport(int)` - Use
-            `MappedTrackInfo.getTypeSupport(int)`.
-        *   `MappedTrackInfo.getTrackFormatSupport(int, int, int)` - Use
-            `MappedTrackInfo.getTrackSupport(int, int, int)`.
-        *   `MappedTrackInfo.getUnassociatedTrackGroups()` - Use
-            `MappedTrackInfo.getUnmappedTrackGroups()`.
     *   Remove deprecated interface `AdaptiveMediaSourceEventListener`. Use
         `MediaSourceEventListener` instead.
     *   Add a `LivePlaybackSpeedControl` component to control the playback speed
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 4b26e7cedf..4a9ed06478 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -1316,19 +1316,6 @@ public class SimpleExoPlayer extends BasePlayer
     removeMetadataOutput(output);
   }
 
-  /**
-   * @deprecated Use {@link #addAnalyticsListener(AnalyticsListener)} to get more detailed debug
-   *     information.
-   */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public void setVideoDebugListener(@Nullable VideoRendererEventListener listener) {
-    videoDebugListeners.retainAll(Collections.singleton(analyticsCollector));
-    if (listener != null) {
-      addVideoDebugListener(listener);
-    }
-  }
-
   /**
    * @deprecated Use {@link #addAnalyticsListener(AnalyticsListener)} to get more detailed debug
    *     information.
@@ -1348,19 +1335,6 @@ public class SimpleExoPlayer extends BasePlayer
     videoDebugListeners.remove(listener);
   }
 
-  /**
-   * @deprecated Use {@link #addAnalyticsListener(AnalyticsListener)} to get more detailed debug
-   *     information.
-   */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public void setAudioDebugListener(@Nullable AudioRendererEventListener listener) {
-    audioDebugListeners.retainAll(Collections.singleton(analyticsCollector));
-    if (listener != null) {
-      addAudioDebugListener(listener);
-    }
-  }
-
   /**
    * @deprecated Use {@link #addAnalyticsListener(AnalyticsListener)} to get more detailed debug
    *     information.