diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java
index 780c3148a324b..fe4fa90a272dd 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java
@@ -39,7 +39,6 @@ import com.android.launcher3.icons.ShadowGenerator;
 import com.android.systemui.Interpolators;
 import com.android.systemui.R;
 import com.android.systemui.statusbar.notification.collection.NotificationEntry;
-import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
 
 /**
  * A floating object on the screen that can post message updates.
@@ -141,15 +140,6 @@ public class BubbleView extends FrameLayout {
         mUserBadgedAppIcon = appIcon;
     }
 
-    /**
-     * @return the {@link ExpandableNotificationRow} view to display notification content when the
-     * bubble is expanded.
-     */
-    @Nullable
-    public ExpandableNotificationRow getRowView() {
-        return (mBubble != null) ? mBubble.getEntry().getRow() : null;
-    }
-
     /** Changes the dot's visibility to match the bubble view's state. */
     void updateDotVisibility(boolean animate) {
         updateDotVisibility(animate, null /* after */);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
index 153fddaa8cb3a..71fc5490d656c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
@@ -85,11 +85,6 @@ import java.util.Objects;
  * clean this up in the future.
  */
 public final class NotificationEntry {
-    private static final long LAUNCH_COOLDOWN = 2000;
-    private static final long REMOTE_INPUT_COOLDOWN = 500;
-    private static final long INITIALIZATION_DELAY = 400;
-    private static final long NOT_LAUNCHED_YET = -LAUNCH_COOLDOWN;
-    private static final int COLOR_INVALID = 1;
 
     private final String mKey;
     private StatusBarNotification mSbn;
@@ -109,7 +104,6 @@ public final class NotificationEntry {
     * TODO: Remove every member beneath this line if possible
     */
 
-    public boolean noisy;
     public StatusBarIconView icon;
     public StatusBarIconView expandedIcon;
     public StatusBarIconView centeredIcon;
@@ -965,4 +959,10 @@ public final class NotificationEntry {
             this.index = index;
         }
     }
+
+    private static final long LAUNCH_COOLDOWN = 2000;
+    private static final long REMOTE_INPUT_COOLDOWN = 500;
+    private static final long INITIALIZATION_DELAY = 400;
+    private static final long NOT_LAUNCHED_YET = -LAUNCH_COOLDOWN;
+    private static final int COLOR_INVALID = 1;
 }