diff --git a/device/api/umd/device/cluster.h b/device/api/umd/device/cluster.h
index 7d54642b..d61eddf0 100644
--- a/device/api/umd/device/cluster.h
+++ b/device/api/umd/device/cluster.h
@@ -1200,8 +1200,6 @@ class Cluster : public tt_device {
     // coordinates. This is an internal helper function, until we switch the API to accept translated coordinates.
     tt_xy_pair translate_chip_coord_virtual_to_translated(const chip_id_t chip_id, const tt_xy_pair core) const;
 
-    static std::vector<ChipInfo> get_cluster_chip_info(
-        const std::vector<std::unique_ptr<tt::umd::TTDevice>>& tt_devices);
     static std::unique_ptr<tt_ClusterDescriptor> create_cluster_descriptor(
         const std::unordered_map<chip_id_t, std::unique_ptr<tt::umd::Chip>>& chips);
 
diff --git a/device/chip/local_chip.cpp b/device/chip/local_chip.cpp
index b46b6d60..8dc17362 100644
--- a/device/chip/local_chip.cpp
+++ b/device/chip/local_chip.cpp
@@ -54,9 +54,9 @@ TTDevice* LocalChip::get_tt_device() { return tt_device_.get(); }
 bool LocalChip::is_mmio_capable() const { return true; }
 
 void LocalChip::wait_eth_cores_training(const uint32_t timeout_per_core_ms) {
-    log_assert(
-        get_tt_device()->get_arch() == tt::ARCH::BLACKHOLE,
-        "Waiting for training of ETH cores is supported only for Blackhole LocalChip.");
+    if (get_tt_device()->get_arch() != tt::ARCH::BLACKHOLE) {
+        return;
+    }
 
     const std::vector<CoreCoord> eth_cores = get_soc_descriptor().get_cores(CoreType::ETH);
     for (const CoreCoord& eth_core : eth_cores) {
diff --git a/device/cluster.cpp b/device/cluster.cpp
index 5eab03e2..fa33b0fb 100644
--- a/device/cluster.cpp
+++ b/device/cluster.cpp
@@ -3463,23 +3463,6 @@ std::unique_ptr<tt_ClusterDescriptor> Cluster::create_cluster_descriptor() {
     }
 }
 
-std::vector<ChipInfo> Cluster::get_cluster_chip_info(
-    const std::vector<std::unique_ptr<tt::umd::TTDevice>>& tt_devices) {
-    std::vector<tt_xy_pair> eth_cores = tt::umd::blackhole::ETH_CORES;
-    const auto tlb_index = tt::umd::blackhole::MEM_LARGE_READ_TLB;
-
-    // TODO: make this generic when this code is used for other architectures.
-    tt_xy_pair arc_core = tt::umd::blackhole::ARC_CORES[0];
-
-    std::vector<ChipInfo> chip_info_vec;
-    for (auto& tt_device : tt_devices) {
-        tt_device->wait_arc_core_start(arc_core);
-        chip_info_vec.push_back(tt_device->get_chip_info());
-    }
-
-    return chip_info_vec;
-}
-
 std::unique_ptr<tt_ClusterDescriptor> Cluster::create_cluster_descriptor(
     const std::unordered_map<chip_id_t, std::unique_ptr<tt::umd::Chip>>& chips) {
     std::unique_ptr<tt_ClusterDescriptor> desc = std::unique_ptr<tt_ClusterDescriptor>(new tt_ClusterDescriptor());