diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/BUCK
index b79c3b7863..7cad90f131 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/BUCK
@@ -28,14 +28,8 @@ rn_xplat_cxx_library(
     deps = [
         react_native_xplat_target("config:config"),
         react_native_xplat_target("fabric/uimanager:uimanager"),
-        react_native_xplat_target("fabric/components/activityindicator:activityindicator"),
         react_native_xplat_target("fabric/components/scrollview:scrollview"),
-        react_native_xplat_target("fabric/components/image:image"),
-        react_native_xplat_target("fabric/components/text:text"),
         react_native_target("jni/react/jni:jni"),
-        "xplat//ReactNative/fabric/components/ReactPerformanceLogger:ReactPerformanceLogger",
-        "xplat//ReactNative/fabric/components/ShimmeringView:ShimmeringView",
-        "xplat//ReactNative/fabric/components/TemplateView:TemplateView",
         "xplat//fbsystrace:fbsystrace",
         "xplat//folly:molly",
         "xplat//jsi:JSIDynamic",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp
index 5229202f1f..d972f98733 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp
@@ -120,6 +120,7 @@ void Binding::uninstallFabricUIManager() {
   javaUIManager_ = nullptr;
 }
 
+//TODO: this method will be removed when binding for components are code-gen
 local_ref<JString> getPlatformComponentName(const ShadowView &shadowView) {
   local_ref<JString> componentName;
   auto newViewProps = std::dynamic_pointer_cast<const ScrollViewProps>(shadowView.props);