diff --git a/osi/core/mgbe_mmc.c b/osi/core/mgbe_mmc.c
index 57e65bb..c0bd3e7 100644
--- a/osi/core/mgbe_mmc.c
+++ b/osi/core/mgbe_mmc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -101,12 +101,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 {
 	struct osi_mmc_counters *mmc = &osi_core->mmc;
 
-	mmc->mmc_tx_octetcount_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_gb,
-			       MMC_TXOCTETCOUNT_GB_L);
-	mmc->mmc_tx_octetcount_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_gb_h,
-			       MMC_TXOCTETCOUNT_GB_H);
 	mmc->mmc_tx_framecount_gb =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_gb,
 			       MMC_TXPACKETCOUNT_GB_L);
@@ -125,42 +119,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 	mmc->mmc_tx_multicastframe_g_h =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_multicastframe_g_h,
 			       MMC_TXMULTICASTPACKETS_G_H);
-	mmc->mmc_tx_64_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_64_octets_gb,
-			       MMC_TX64OCTETS_GB_L);
-	mmc->mmc_tx_64_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_64_octets_gb_h,
-			       MMC_TX64OCTETS_GB_H);
-	mmc->mmc_tx_65_to_127_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_65_to_127_octets_gb,
-			       MMC_TX65TO127OCTETS_GB_L);
-	mmc->mmc_tx_65_to_127_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_65_to_127_octets_gb_h,
-			       MMC_TX65TO127OCTETS_GB_H);
-	mmc->mmc_tx_128_to_255_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_128_to_255_octets_gb,
-			       MMC_TX128TO255OCTETS_GB_L);
-	mmc->mmc_tx_128_to_255_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_128_to_255_octets_gb_h,
-			       MMC_TX128TO255OCTETS_GB_H);
-	mmc->mmc_tx_256_to_511_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_256_to_511_octets_gb,
-			       MMC_TX256TO511OCTETS_GB_L);
-	mmc->mmc_tx_256_to_511_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_256_to_511_octets_gb_h,
-			       MMC_TX256TO511OCTETS_GB_H);
-	mmc->mmc_tx_512_to_1023_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_512_to_1023_octets_gb,
-			       MMC_TX512TO1023OCTETS_GB_L);
-	mmc->mmc_tx_512_to_1023_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_512_to_1023_octets_gb_h,
-			       MMC_TX512TO1023OCTETS_GB_H);
-	mmc->mmc_tx_1024_to_max_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_1024_to_max_octets_gb,
-			       MMC_TX1024TOMAXOCTETS_GB_L);
-	mmc->mmc_tx_1024_to_max_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_1024_to_max_octets_gb_h,
-			       MMC_TX1024TOMAXOCTETS_GB_H);
 	mmc->mmc_tx_unicast_gb =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_unicast_gb,
 			       MMC_TXUNICASTPACKETS_GB_L);
@@ -185,39 +143,12 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 	mmc->mmc_tx_underflow_error_h =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_underflow_error_h,
 			       MMC_TXUNDERFLOWERROR_H);
-	mmc->mmc_tx_singlecol_g =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_singlecol_g,
-			       MMC_TXSINGLECOL_G);
-	mmc->mmc_tx_multicol_g =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_multicol_g,
-			       MMC_TXMULTICOL_G);
-	mmc->mmc_tx_deferred =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_deferred,
-			       MMC_TXDEFERRED);
-	mmc->mmc_tx_latecol =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_latecol,
-			       MMC_TXLATECOL);
-	mmc->mmc_tx_exesscol =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_exesscol,
-			       MMC_TXEXESSCOL);
-	mmc->mmc_tx_carrier_error =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_carrier_error,
-			       MMC_TXCARRIERERROR);
-	mmc->mmc_tx_octetcount_g =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_g,
-			       MMC_TXOCTETCOUNT_G_L);
-	mmc->mmc_tx_octetcount_g_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_g_h,
-			       MMC_TXOCTETCOUNT_G_H);
 	mmc->mmc_tx_framecount_g =
 		 mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_g,
 				MMC_TXPACKETSCOUNT_G_L);
 	mmc->mmc_tx_framecount_g_h =
 		 mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_g_h,
 				MMC_TXPACKETSCOUNT_G_H);
-	mmc->mmc_tx_excessdef =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_excessdef,
-			       MMC_TXEXECESS_DEFERRED);
 	mmc->mmc_tx_pause_frame =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_tx_pause_frame,
 			       MMC_TXPAUSEPACKETS_L);
@@ -236,18 +167,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 	mmc->mmc_rx_framecount_gb_h =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_framecount_gb_h,
 			       MMC_RXPACKETCOUNT_GB_H);
-	mmc->mmc_rx_octetcount_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_gb,
-			       MMC_RXOCTETCOUNT_GB_L);
-	mmc->mmc_rx_octetcount_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_gb_h,
-			       MMC_RXOCTETCOUNT_GB_H);
-	mmc->mmc_rx_octetcount_g =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_g,
-			       MMC_RXOCTETCOUNT_G_L);
-	mmc->mmc_rx_octetcount_g_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_g_h,
-			       MMC_RXOCTETCOUNT_G_H);
 	mmc->mmc_rx_broadcastframe_g =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_broadcastframe_g,
 			       MMC_RXBROADCASTPACKETS_G_L);
@@ -281,42 +200,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 	mmc->mmc_rx_oversize_g =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_oversize_g,
 			       MMC_RXOVERSIZE_G);
-	mmc->mmc_rx_64_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_64_octets_gb,
-			       MMC_RX64OCTETS_GB_L);
-	mmc->mmc_rx_64_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_64_octets_gb_h,
-			       MMC_RX64OCTETS_GB_H);
-	mmc->mmc_rx_65_to_127_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_65_to_127_octets_gb,
-			       MMC_RX65TO127OCTETS_GB_L);
-	mmc->mmc_rx_65_to_127_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_65_to_127_octets_gb_h,
-			       MMC_RX65TO127OCTETS_GB_H);
-	mmc->mmc_rx_128_to_255_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_128_to_255_octets_gb,
-			       MMC_RX128TO255OCTETS_GB_L);
-	mmc->mmc_rx_128_to_255_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_128_to_255_octets_gb_h,
-			       MMC_RX128TO255OCTETS_GB_H);
-	mmc->mmc_rx_256_to_511_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_256_to_511_octets_gb,
-			       MMC_RX256TO511OCTETS_GB_L);
-	mmc->mmc_rx_256_to_511_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_256_to_511_octets_gb_h,
-			       MMC_RX256TO511OCTETS_GB_H);
-	mmc->mmc_rx_512_to_1023_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_512_to_1023_octets_gb,
-			       MMC_RX512TO1023OCTETS_GB_L);
-	mmc->mmc_rx_512_to_1023_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_512_to_1023_octets_gb_h,
-			       MMC_RX512TO1023OCTETS_GB_H);
-	mmc->mmc_rx_1024_to_max_octets_gb =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_1024_to_max_octets_gb,
-			       MMC_RX1024TOMAXOCTETS_GB_L);
-	mmc->mmc_rx_1024_to_max_octets_gb_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_1024_to_max_octets_gb_h,
-			       MMC_RX1024TOMAXOCTETS_GB_H);
 	mmc->mmc_rx_unicast_g =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_unicast_g,
 			       MMC_RXUNICASTPACKETS_G_L);
@@ -452,12 +335,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 	mmc->mmc_rx_icmp_err_h =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_err_h,
 			       MMC_RXICMP_ERR_PKTS_H);
-	mmc->mmc_rx_ipv4_gd_octets =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_gd_octets,
-			       MMC_RXIPV4_GD_OCTETS_L);
-	mmc->mmc_rx_ipv4_gd_octets_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_gd_octets_h,
-			       MMC_RXIPV4_GD_OCTETS_H);
 	mmc->mmc_rx_ipv4_hderr_octets =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_hderr_octets,
 			       MMC_RXIPV4_HDRERR_OCTETS_L);
@@ -482,18 +359,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 	mmc->mmc_rx_ipv4_udsbl_octets_h =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_udsbl_octets_h,
 			       MMC_RXIPV4_UDP_CHKSM_DIS_OCT_H);
-	mmc->mmc_rx_udp_gd_octets =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_udp_gd_octets,
-			       MMC_RXUDP_GD_OCTETS_L);
-	mmc->mmc_rx_udp_gd_octets_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_udp_gd_octets_h,
-			       MMC_RXUDP_GD_OCTETS_H);
-	mmc->mmc_rx_ipv6_gd_octets =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv6_gd_octets,
-			       MMC_RXIPV6_GD_OCTETS_L);
-	mmc->mmc_rx_ipv6_gd_octets_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv6_gd_octets_h,
-			       MMC_RXIPV6_GD_OCTETS_H);
 	mmc->mmc_rx_ipv6_hderr_octets =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv6_hderr_octets,
 			       MMC_RXIPV6_HDRERR_OCTETS_L);
@@ -512,24 +377,12 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
 	mmc->mmc_rx_udp_err_octets_h =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_udp_err_octets_h,
 			       MMC_RXUDP_ERR_OCTETS_H);
-	mmc->mmc_rx_tcp_gd_octets =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_gd_octets,
-			       MMC_RXTCP_GD_OCTETS_L);
-	mmc->mmc_rx_tcp_gd_octets_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_gd_octets_h,
-			       MMC_RXTCP_GD_OCTETS_H);
 	mmc->mmc_rx_tcp_err_octets =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_err_octets,
 			       MMC_RXTCP_ERR_OCTETS_L);
 	mmc->mmc_rx_tcp_err_octets_h =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_err_octets_h,
 			       MMC_RXTCP_ERR_OCTETS_H);
-	mmc->mmc_rx_icmp_gd_octets =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_gd_octets,
-			       MMC_RXICMP_GD_OCTETS_L);
-	mmc->mmc_rx_icmp_gd_octets_h =
-		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_gd_octets_h,
-			       MMC_RXICMP_GD_OCTETS_H);
 	mmc->mmc_rx_icmp_err_octets =
 		mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_err_octets,
 			       MMC_RXICMP_ERR_OCTETS_L);