diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index e6d13f0219da..d53905264ba6 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -482,8 +482,6 @@ typedef enum eSirBssType {
 	eSIR_INFRASTRUCTURE_MODE,
 	eSIR_INFRA_AP_MODE,     /* Added for softAP support */
 	eSIR_IBSS_MODE,
-	eSIR_BTAMP_STA_MODE,    /* Added for BT-AMP support */
-	eSIR_BTAMP_AP_MODE,     /* Added for BT-AMP support */
 	eSIR_AUTO_MODE,
 	eSIR_DONOT_USE_BSS_TYPE = SIR_MAX_ENUM_SIZE
 } tSirBssType;
diff --git a/core/mac/src/cfg/cfg_api.c b/core/mac/src/cfg/cfg_api.c
index 78c0018055aa..18c7afe7b8eb 100644
--- a/core/mac/src/cfg/cfg_api.c
+++ b/core/mac/src/cfg/cfg_api.c
@@ -725,8 +725,6 @@ tSirRetStatus cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
 	if (LIM_IS_IBSS_ROLE(sessionEntry))
 		pCapInfo->ibss = 1;     /* IBSS bit */
 	else if (LIM_IS_AP_ROLE(sessionEntry) ||
-		LIM_IS_BT_AMP_AP_ROLE(sessionEntry) ||
-		LIM_IS_BT_AMP_STA_ROLE(sessionEntry) ||
 		LIM_IS_STA_ROLE(sessionEntry))
 		pCapInfo->ess = 1;      /* ESS bit */
 	else if (LIM_IS_P2P_DEVICE_ROLE(sessionEntry)) {
diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index c9d78ddaeb69..394353d62047 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -109,21 +109,6 @@ typedef enum eSriLinkState {
 	eSIR_LINK_POSTASSOC_STATE = 2,
 	eSIR_LINK_AP_STATE = 3,
 	eSIR_LINK_IBSS_STATE = 4,
-	/* BT-AMP Case */
-	eSIR_LINK_BTAMP_PREASSOC_STATE = 5,
-	eSIR_LINK_BTAMP_POSTASSOC_STATE = 6,
-	eSIR_LINK_BTAMP_AP_STATE = 7,
-	eSIR_LINK_BTAMP_STA_STATE = 8,
-
-	/* Reserved for HAL internal use */
-	eSIR_LINK_LEARN_STATE = 9,
-	eSIR_LINK_SCAN_STATE = 10,
-	eSIR_LINK_FINISH_SCAN_STATE = 11,
-	eSIR_LINK_INIT_CAL_STATE = 12,
-	eSIR_LINK_FINISH_CAL_STATE = 13,
-	eSIR_LINK_LISTEN_STATE = 14,
-	eSIR_LINK_SEND_ACTION_STATE = 15,
-	eSIR_LINK_DOWN_STATE = 16,
 } tSirLinkState;
 
 /* / Message queue structure used across Sirius project. */
diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h
index 126f2aa1baa8..0622887c161b 100644
--- a/core/mac/src/pe/include/lim_api.h
+++ b/core/mac/src/pe/include/lim_api.h
@@ -60,8 +60,6 @@
 #define LIM_IS_STA_ROLE(psessionEntry)          (GET_LIM_SYSTEM_ROLE(psessionEntry) == eLIM_STA_ROLE)
 #define LIM_IS_IBSS_ROLE(psessionEntry)         (GET_LIM_SYSTEM_ROLE(psessionEntry) == eLIM_STA_IN_IBSS_ROLE)
 #define LIM_IS_UNKNOWN_ROLE(psessionEntry)      (GET_LIM_SYSTEM_ROLE(psessionEntry) == eLIM_UNKNOWN_ROLE)
-#define LIM_IS_BT_AMP_AP_ROLE(psessionEntry)    (GET_LIM_SYSTEM_ROLE(psessionEntry) == eLIM_BT_AMP_AP_ROLE)
-#define LIM_IS_BT_AMP_STA_ROLE(psessionEntry)   (GET_LIM_SYSTEM_ROLE(psessionEntry) == eLIM_BT_AMP_STA_ROLE)
 #define LIM_IS_P2P_DEVICE_ROLE(psessionEntry)   (GET_LIM_SYSTEM_ROLE(psessionEntry) == eLIM_P2P_DEVICE_ROLE)
 #define LIM_IS_P2P_DEVICE_GO(psessionEntry)     (GET_LIM_SYSTEM_ROLE(psessionEntry) == eLIM_P2P_DEVICE_GO)
 /* gLimSmeState */
diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h
index e1efe10930f0..dd405a8318a9 100644
--- a/core/mac/src/pe/include/lim_global.h
+++ b/core/mac/src/pe/include/lim_global.h
@@ -81,8 +81,6 @@ typedef enum eLimSystemRole {
 	eLIM_AP_ROLE,
 	eLIM_STA_IN_IBSS_ROLE,
 	eLIM_STA_ROLE,
-	eLIM_BT_AMP_STA_ROLE,
-	eLIM_BT_AMP_AP_ROLE,
 	eLIM_P2P_DEVICE_ROLE,
 	eLIM_P2P_DEVICE_GO,
 	eLIM_P2P_DEVICE_CLIENT
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 01a2afc88750..a85e9d6ef340 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -615,10 +615,8 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 
 	if (pftSessionEntry->bssType == eSIR_INFRASTRUCTURE_MODE) {
 		pftSessionEntry->limSystemRole = eLIM_STA_ROLE;
-	} else if (pftSessionEntry->bssType == eSIR_BTAMP_AP_MODE) {
-		pftSessionEntry->limSystemRole = eLIM_BT_AMP_STA_ROLE;
 	} else {
-		/* Throw an error and return and make sure to delete the session. */
+		/* Throw an error & return & make sure to delete the session */
 		lim_log(pMac, LOGE, FL("Invalid bss type"));
 	}