diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6615b448294..9d7f46d39a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,7 +320,6 @@ if("$ENV{ARCH_NAME}" STREQUAL "wormhole_b0")
             tt_metal/hw/inc/wormhole
             ${PROJECT_SOURCE_DIR}/tt_metal/hw/inc/wormhole/wormhole_b0_defines
             ${UMD_HOME}/device/wormhole
-            ${UMD_HOME}/src/firmware/riscv/wormhole
     )
 else()
     target_include_directories(
@@ -328,7 +327,6 @@ else()
         INTERFACE
             ${PROJECT_SOURCE_DIR}/tt_metal/hw/inc/$ENV{ARCH_NAME}
             ${UMD_HOME}/device/$ENV{ARCH_NAME}
-            ${UMD_HOME}/src/firmware/riscv/$ENV{ARCH_NAME}
     )
 endif()
 
diff --git a/tt_metal/hw/inc/blackhole/eth_interface.h b/tt_metal/hw/inc/blackhole/eth_interface.h
deleted file mode 100644
index 676ba847483..00000000000
--- a/tt_metal/hw/inc/blackhole/eth_interface.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "tt_metal/third_party/umd/src/firmware/riscv/blackhole/eth_interface.h"
diff --git a/tt_metal/hw/inc/grayskull/eth_interface.h b/tt_metal/hw/inc/grayskull/eth_interface.h
deleted file mode 100644
index 1f965f087db..00000000000
--- a/tt_metal/hw/inc/grayskull/eth_interface.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-const uint32_t ETH_RACK_COORD_WIDTH = 0;
-const uint32_t CMD_BUF_SIZE_MASK = 0;
-const uint32_t MAX_BLOCK_SIZE = 0;
-const uint32_t REQUEST_CMD_QUEUE_BASE = 0;
-const uint32_t RESPONSE_CMD_QUEUE_BASE = 0;
-const uint32_t CMD_COUNTERS_SIZE_BYTES = 0;
-const uint32_t REMOTE_UPDATE_PTR_SIZE_BYTES = 0;
-const uint32_t CMD_DATA_BLOCK = 0;
-const uint32_t CMD_WR_REQ = 0;
-const uint32_t CMD_WR_ACK = 0;
-const uint32_t CMD_RD_REQ = 0;
-const uint32_t CMD_RD_DATA = 0;
-const uint32_t CMD_BUF_SIZE = 0;
-const uint32_t CMD_DATA_BLOCK_DRAM = 0;
-const uint32_t ETH_ROUTING_DATA_BUFFER_ADDR = 0;
-const uint32_t REQUEST_ROUTING_CMD_QUEUE_BASE = 0;
-const uint32_t RESPONSE_ROUTING_CMD_QUEUE_BASE = 0;
-const uint32_t CMD_BUF_PTR_MASK = 0;
diff --git a/tt_metal/hw/inc/wormhole/eth_interface.h b/tt_metal/hw/inc/wormhole/eth_interface.h
deleted file mode 100644
index 53285a9529e..00000000000
--- a/tt_metal/hw/inc/wormhole/eth_interface.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "tt_metal/third_party/umd/src/firmware/riscv/wormhole/eth_interface.h"
diff --git a/tt_metal/llrt/tt_cluster.cpp b/tt_metal/llrt/tt_cluster.cpp
index fcf3fe39a0a..81f859100b4 100644
--- a/tt_metal/llrt/tt_cluster.cpp
+++ b/tt_metal/llrt/tt_cluster.cpp
@@ -310,7 +310,6 @@ void Cluster::open_driver(const bool &skip_driver_allocs) {
                 device_driver->configure_active_ethernet_cores_for_mmio_device(mmio_device_id, {});
             }
         }
-        device_driver->set_driver_eth_interface_params(eth_interface_params);
 
         // Adding this check is a workaround for current UMD bug that only uses this getter to populate private metadata
         // that is later expected to be populated by unrelated APIs
diff --git a/tt_metal/llrt/tt_cluster.hpp b/tt_metal/llrt/tt_cluster.hpp
index 4042e330d68..59633f28bee 100644
--- a/tt_metal/llrt/tt_cluster.hpp
+++ b/tt_metal/llrt/tt_cluster.hpp
@@ -17,7 +17,6 @@
 
 // clang-format off
 #include "noc/noc_parameters.h"
-#include "eth_interface.h"
 #include "eth_l1_address_map.h"
 #include "dev_msgs.h"
 // clang-format on
@@ -291,28 +290,6 @@ class Cluster {
         (uint32_t)eth_l1_mem::address_map::FW_VERSION_ADDR,
     };
 
-    tt_driver_eth_interface_params eth_interface_params = {
-        NOC_ADDR_LOCAL_BITS,
-        NOC_ADDR_NODE_ID_BITS,
-        ETH_RACK_COORD_WIDTH,
-        CMD_BUF_SIZE_MASK,
-        MAX_BLOCK_SIZE,
-        REQUEST_CMD_QUEUE_BASE,
-        RESPONSE_CMD_QUEUE_BASE,
-        CMD_COUNTERS_SIZE_BYTES,
-        REMOTE_UPDATE_PTR_SIZE_BYTES,
-        CMD_DATA_BLOCK,
-        CMD_WR_REQ,
-        CMD_WR_ACK,
-        CMD_RD_REQ,
-        CMD_RD_DATA,
-        CMD_BUF_SIZE,
-        CMD_DATA_BLOCK_DRAM,
-        ETH_ROUTING_DATA_BUFFER_ADDR,
-        REQUEST_ROUTING_CMD_QUEUE_BASE,
-        RESPONSE_ROUTING_CMD_QUEUE_BASE,
-        CMD_BUF_PTR_MASK};
-
     std::unordered_map<chip_id_t, std::unordered_map<chip_id_t, std::vector<CoreCoord>>> ethernet_sockets_;
 };
 
diff --git a/tt_metal/third_party/umd b/tt_metal/third_party/umd
index 0d22ffea6b1..baed1c889ff 160000
--- a/tt_metal/third_party/umd
+++ b/tt_metal/third_party/umd
@@ -1 +1 @@
-Subproject commit 0d22ffea6b1d781bb3834a428e07a72deddc45df
+Subproject commit baed1c889ff63e4d84b23d6d8cb3ad24a2390384