diff --git a/init_deinit/dispatcher/src/dispatcher_init_deinit.c b/init_deinit/dispatcher/src/dispatcher_init_deinit.c
index 7b419877b3..f7cda23f59 100644
--- a/init_deinit/dispatcher/src/dispatcher_init_deinit.c
+++ b/init_deinit/dispatcher/src/dispatcher_init_deinit.c
@@ -40,9 +40,7 @@
 #include "wifi_pos_api.h"
 #endif /* WIFI_POS_CONVERGED */
 #include <wlan_reg_services_api.h>
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 #include "wlan_crypto_main.h"
-#endif
 #ifdef DFS_COMPONENT_ENABLE
 #include <wlan_dfs_init_deinit_api.h>
 #endif
@@ -550,7 +548,6 @@ static QDF_STATUS atf_psoc_disable(struct wlan_objmgr_psoc *psoc)
 }
 #endif /* END of WLAN_ATF_ENABLE */
 
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 static QDF_STATUS dispatcher_init_crypto(void)
 {
 	return wlan_crypto_init();
@@ -570,27 +567,6 @@ static QDF_STATUS dispatcher_crypto_psoc_disable(struct wlan_objmgr_psoc *psoc)
 {
 	return wlan_crypto_psoc_disable(psoc);
 }
-#else
-static QDF_STATUS dispatcher_init_crypto(void)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static QDF_STATUS dispatcher_deinit_crypto(void)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static QDF_STATUS dispatcher_crypto_psoc_enable(struct wlan_objmgr_psoc *psoc)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static QDF_STATUS dispatcher_crypto_psoc_disable(struct wlan_objmgr_psoc *psoc)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif /* END of WLAN_CONV_CRYPTO_SUPPORTED */
 
 #ifdef WIFI_POS_CONVERGED
 static QDF_STATUS dispatcher_init_wifi_pos(void)
diff --git a/iot_sim/Kbuild b/iot_sim/Kbuild
index 329b1dc9a7..5dd859f1a5 100644
--- a/iot_sim/Kbuild
+++ b/iot_sim/Kbuild
@@ -30,10 +30,8 @@ INCS += -I$(obj)/$(DEPTH)/component_dev/wmi/inc
 INCS += -I$(obj)/$(DEPTH)/pld/inc
 INCS += -I$(obj)/$(DEPTH)/component_dev/dp/inc
 
-ifeq ($(WLAN_CONV_CRYPTO_SUPPORTED), 1)
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/cmn_services/crypto/inc
 INCS += -I$(obj)/$(DEPTH)/component_dev/crypto/inc
-endif
 
 ifeq ($(WLAN_SUPPORT_GREEN_AP), 1)
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/green_ap/dispatcher/inc
diff --git a/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h b/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h
index ca27b6fcfe..b588bb6795 100644
--- a/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h
+++ b/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h
@@ -24,7 +24,6 @@
 #define _WLAN_CFG80211_CRYPTO_H_
 #include <net/cfg80211.h>
 #include "wlan_crypto_global_def.h"
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 /**
  * wlan_cfg80211_set_default_key() - to set the default key to be used
  * @vdev: VDEV Object pointer
@@ -36,14 +35,6 @@
 int wlan_cfg80211_set_default_key(struct wlan_objmgr_vdev *vdev,
 				  uint8_t key_index,
 				  struct qdf_mac_addr *bssid);
-#else
-static inline int wlan_cfg80211_set_default_key(struct wlan_objmgr_vdev *vdev,
-						uint8_t key_index,
-						struct qdf_mac_addr *bssid)
-{
-	return 0;
-}
-#endif
 
 /**
  * wlan_cfg80211_store_key() - Store the key
diff --git a/os_if/linux/crypto/src/wlan_cfg80211_crypto.c b/os_if/linux/crypto/src/wlan_cfg80211_crypto.c
index b74be913e1..01bb13bd8c 100644
--- a/os_if/linux/crypto/src/wlan_cfg80211_crypto.c
+++ b/os_if/linux/crypto/src/wlan_cfg80211_crypto.c
@@ -220,11 +220,9 @@ int wlan_cfg80211_crypto_add_key(struct wlan_objmgr_vdev *vdev,
 	return qdf_status_to_os_return(status);
 }
 
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 int wlan_cfg80211_set_default_key(struct wlan_objmgr_vdev *vdev,
 				  uint8_t key_index, struct qdf_mac_addr *bssid)
 {
 	return wlan_crypto_default_key(vdev, (uint8_t *)bssid,
 				       key_index, true);
 }
-#endif
diff --git a/spectral/Kbuild b/spectral/Kbuild
index f31cb0e3fc..2c61acfa78 100644
--- a/spectral/Kbuild
+++ b/spectral/Kbuild
@@ -42,10 +42,8 @@ INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/thermal/dispatcher/inc
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/mlme/connection_mgr/utf/inc
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/mlo_mgr/inc
 
-ifeq ($(WLAN_CONV_CRYPTO_SUPPORTED), 1)
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/cmn_services/crypto/inc
 INCS += -I$(obj)/$(DEPTH)/component_dev/crypto/inc
-endif
 
 ifeq ($(WLAN_SUPPORT_GREEN_AP), 1)
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/green_ap/dispatcher/inc
diff --git a/target_if/core/src/target_if_main.c b/target_if/core/src/target_if_main.c
index e857c8742a..d8f49c6c43 100644
--- a/target_if/core/src/target_if_main.c
+++ b/target_if/core/src/target_if_main.c
@@ -357,7 +357,7 @@ static QDF_STATUS target_if_green_ap_tx_ops_register(
 	return QDF_STATUS_SUCCESS;
 }
 #endif /* WLAN_SUPPORT_GREEN_AP */
-#if defined(WLAN_CONV_CRYPTO_SUPPORTED) && defined(CRYPTO_SET_KEY_CONVERGED)
+#if defined(CRYPTO_SET_KEY_CONVERGED)
 static void target_if_crypto_tx_ops_register(
 				struct wlan_lmac_if_tx_ops *tx_ops)
 {
diff --git a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h
index e0432a8e34..80b90f89ec 100644
--- a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h
+++ b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h
@@ -39,9 +39,7 @@
 #endif
 #include <reg_services_public_struct.h>
 
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 #include "wlan_crypto_global_def.h"
-#endif
 
 #ifdef WLAN_CFR_ENABLE
 #include "wlan_cfr_utils_api.h"
@@ -1255,9 +1253,7 @@ struct wlan_lmac_if_tx_ops {
 	struct wlan_lmac_if_sptrl_tx_ops sptrl_tx_ops;
 #endif
 
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 	struct wlan_lmac_if_crypto_tx_ops crypto_tx_ops;
-#endif
 
 #ifdef WIFI_POS_CONVERGED
 	struct wlan_lmac_if_wifi_pos_tx_ops wifi_pos_tx_ops;
@@ -1999,9 +1995,7 @@ struct wlan_lmac_if_rx_ops {
 	struct wlan_lmac_if_sptrl_rx_ops sptrl_rx_ops;
 #endif
 
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 	struct wlan_lmac_if_crypto_rx_ops crypto_rx_ops;
-#endif
 #ifdef WIFI_POS_CONVERGED
 	struct wlan_lmac_if_wifi_pos_rx_ops wifi_pos_rx_ops;
 #endif
diff --git a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c
index bcc3ed2151..4b51d39282 100644
--- a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c
+++ b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c
@@ -42,9 +42,7 @@
 #include "wlan_tdls_tgt_api.h"
 #endif
 
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 #include "wlan_crypto_global_api.h"
-#endif
 #ifdef DFS_COMPONENT_ENABLE
 #include <wlan_dfs_tgt_api.h>
 #include <wlan_objmgr_vdev_obj.h>
@@ -267,18 +265,11 @@ wlan_lmac_if_cfr_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops)
 }
 #endif
 
-#ifdef WLAN_CONV_CRYPTO_SUPPORTED
 static void
 wlan_lmac_if_crypto_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops)
 {
 	wlan_crypto_register_crypto_rx_ops(&rx_ops->crypto_rx_ops);
 }
-#else
-static void
-wlan_lmac_if_crypto_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops)
-{
-}
-#endif
 
 #ifdef WIFI_POS_CONVERGED
 static void wlan_lmac_if_umac_rx_ops_register_wifi_pos(