diff --git a/src/eth/example/KC705/fpga_10g/rtl/fpga_core.sv b/src/eth/example/KC705/fpga_10g/rtl/fpga_core.sv
index bf4a5d7..5ad67ff 100644
--- a/src/eth/example/KC705/fpga_10g/rtl/fpga_core.sv
+++ b/src/eth/example/KC705/fpga_10g/rtl/fpga_core.sv
@@ -462,12 +462,6 @@ sfp_sync_reset_inst (
     .out(sfp_rst)
 );
 
-wire sfp_tx_p_int[1];
-wire sfp_tx_n_int[1];
-
-assign sfp_tx_p = sfp_tx_p_int[0];
-assign sfp_tx_n = sfp_tx_n_int[0];
-
 // synthesis translate_off
 `define SIM
 // synthesis translate_on
@@ -574,10 +568,10 @@ sfp_mac_inst (
     /*
      * Serial data
      */
-    .xcvr_txp(sfp_tx_p_int),
-    .xcvr_txn(sfp_tx_n_int),
-    .xcvr_rxp('{1{sfp_rx_p}}),
-    .xcvr_rxn('{1{sfp_rx_n}}),
+    .xcvr_txp('{sfp_tx_p}),
+    .xcvr_txn('{sfp_tx_n}),
+    .xcvr_rxp('{sfp_rx_p}),
+    .xcvr_rxn('{sfp_rx_n}),
 
     /*
      * MAC clocks
diff --git a/src/eth/example/KR260/fpga/rtl/fpga_core.sv b/src/eth/example/KR260/fpga/rtl/fpga_core.sv
index 62fdbfb..fc90b24 100644
--- a/src/eth/example/KR260/fpga/rtl/fpga_core.sv
+++ b/src/eth/example/KR260/fpga/rtl/fpga_core.sv
@@ -395,16 +395,6 @@ end else begin : sfp_mac
         .out(sfp_rst)
     );
 
-    wire eth_gty_tx_p[1];
-    wire eth_gty_tx_n[1];
-    wire eth_gty_rx_p[1];
-    wire eth_gty_rx_n[1];
-
-    assign sfp_tx_p = eth_gty_tx_p[0];
-    assign sfp_tx_n = eth_gty_tx_n[0];
-    assign eth_gty_rx_p[0] = sfp_rx_p;
-    assign eth_gty_rx_n[0] = sfp_rx_n;
-
     taxi_apb_if #(
         .ADDR_W(18),
         .DATA_W(16)
@@ -469,10 +459,10 @@ end else begin : sfp_mac
         /*
          * Serial data
          */
-        .xcvr_txp(eth_gty_tx_p),
-        .xcvr_txn(eth_gty_tx_n),
-        .xcvr_rxp(eth_gty_rx_p),
-        .xcvr_rxn(eth_gty_rx_n),
+        .xcvr_txp('{sfp_tx_p}),
+        .xcvr_txn('{sfp_tx_n}),
+        .xcvr_rxp('{sfp_rx_p}),
+        .xcvr_rxn('{sfp_rx_n}),
 
         /*
          * MAC clocks