diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 2d47e5a291b9..28d92671f19a 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -1012,18 +1012,18 @@ public void setTouchCancel(@NonNull T view, boolean value) {
    * especially helpful for views that are recycled so we can retain and restore the original
    * listener upon recycling (onDropViewInstance).
    */
-  private class BaseVMFocusChangeListener<V extends View> implements OnFocusChangeListener {
+  private static class BaseVMFocusChangeListener implements OnFocusChangeListener {
     private @Nullable OnFocusChangeListener mOriginalFocusChangeListener;
 
     public BaseVMFocusChangeListener(@Nullable OnFocusChangeListener originalFocusChangeListener) {
       mOriginalFocusChangeListener = originalFocusChangeListener;
     }
 
-    public void attach(T view) {
+    public void attach(View view) {
       view.setOnFocusChangeListener(this);
     }
 
-    public void detach(T view) {
+    public void detach(View view) {
       view.setOnFocusChangeListener(mOriginalFocusChangeListener);
     }
 
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index 757727322c06..b83497e7e73d 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -230,6 +230,7 @@ public void setMaxHeight(Dynamic maxHeight) {
     maxHeight.recycle();
   }
 
+  @Override
   @ReactProp(name = ViewProps.FLEX, defaultFloat = 0f)
   public void setFlex(float flex) {
     if (isVirtual()) {
@@ -238,6 +239,7 @@ public void setFlex(float flex) {
     super.setFlex(flex);
   }
 
+  @Override
   @ReactProp(name = ViewProps.FLEX_GROW, defaultFloat = 0f)
   public void setFlexGrow(float flexGrow) {
     if (isVirtual()) {
@@ -309,6 +311,7 @@ public void setGap(Dynamic gap) {
     gap.recycle();
   }
 
+  @Override
   @ReactProp(name = ViewProps.FLEX_SHRINK, defaultFloat = 0f)
   public void setFlexShrink(float flexShrink) {
     if (isVirtual()) {
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
index 8bcbd2adc6da..79f3f6b5db5f 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
@@ -231,12 +231,6 @@ public void onBatchComplete() {
     mTagsWithLayoutVisited.clear();
   }
 
-  private NodeIndexPair walkUpUntilNativeKindIsParent(
-      ReactShadowNode node, int indexInNativeChildren) {
-    // Logic removed due to NativeKind removal
-    return new NodeIndexPair(node, indexInNativeChildren);
-  }
-
   private void addNodeToNode(ReactShadowNode parent, ReactShadowNode child, int index) {
     // Logic removed due to NativeKind removal
   }
@@ -289,8 +283,6 @@ private void applyLayoutBase(ReactShadowNode node) {
     }
     mTagsWithLayoutVisited.put(tag, true);
 
-    ReactShadowNode parent = node.getParent();
-
     // We use screenX/screenY (which round to integer pixels) at each node in the hierarchy to
     // emulate what the layout would look like if it were actually built with native views which
     // have to have integral top/left/bottom/right values