2 files changed, 2 insertions, 13 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index d6e2a6fdc..83c687637 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -886,14 +886,6 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr)
     }
 
     ////////////////////////////////////////////////////////////////////
-    //clear router?
-    ////////////////////////////////////////////////////////////////////
-    for (size_t i = 0; i < 512; i++) {
-        mb.zpu_ctrl->poke32(SR_ADDR(SETXB_BASE, i), 0);
-    }
-
-
-    ////////////////////////////////////////////////////////////////////
     // setup time sources and properties
     ////////////////////////////////////////////////////////////////////
     _tree->create<std::string>(mb_path / "time_source" / "value")
@@ -950,8 +942,7 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr)
         n_rfnoc_blocks,
         X300_XB_DST_PCI + 1, /* base port */
         uhd::sid_t(X300_SRC_ADDR0, 0, X300_DST_ADDR + mb_i, 0),
-        dev_addr,
-        mb.if_pkt_is_big_endian ? ENDIANNESS_BIG : ENDIANNESS_LITTLE
+        dev_addr
     );
     //////////////// RFNOC /////////////////
 
@@ -1070,6 +1061,7 @@ uhd::both_xports_t x300_impl::make_transport(
     zero_copy_xport_params default_buff_args;
 
     both_xports_t xports;
+    xports.endianness = mb.if_pkt_is_big_endian ? ENDIANNESS_BIG : ENDIANNESS_LITTLE;
     if (mb.xport_path == "nirio") {
         xports.send_sid = this->allocate_sid(mb, address, X300_SRC_ADDR0, X300_XB_DST_PCI);
         xports.recv_sid = xports.send_sid.reversed();
diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp
index 81d8cd3ba..55b055d44 100644
--- a/host/lib/usrp/x300/x300_impl.hpp
+++ b/host/lib/usrp/x300/x300_impl.hpp
@@ -286,9 +286,6 @@ private:
     /// More IO stuff
     uhd::device_addr_t get_tx_hints(size_t mb_index);
     uhd::device_addr_t get_rx_hints(size_t mb_index);
-    uhd::endianness_t get_transport_endianness(size_t mb_index) {
-        return _mb[mb_index].if_pkt_is_big_endian ? uhd::ENDIANNESS_BIG : uhd::ENDIANNESS_LITTLE;
-    };
 
     void post_streamer_hooks(uhd::direction_t dir);
 };