diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 5e8f7d75cd..1f8fbb6a98 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -379,29 +379,6 @@ enum hdd_dot11_mode {
#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_MAX (0x7fffffff)
#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_DEFAULT (60000)
-/*
- *
- * gbug_report_for_scan_results - Enable bug report
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to create bug report in
- * case of nil scan results.
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- *
- */
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN "gbug_report_for_scan_results"
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN_DISABLE (0)
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN_ENABLE (1)
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN_DEFAULT (0)
-
/*
*
* extscan_adaptive_dwell_mode - Enable adaptive dwell mode
@@ -2209,10 +2186,6 @@ struct hdd_config {
uint8_t stationary_thresh;
uint32_t channel_prediction_full_scan;
#endif
- bool early_stop_scan_enable;
- int8_t early_stop_scan_min_threshold;
- int8_t early_stop_scan_max_threshold;
- int8_t first_scan_bucket_threshold;
#ifdef FEATURE_LFR_SUBNET_DETECTION
bool enable_lfr_subnet_detection;
#endif
@@ -2224,8 +2197,6 @@ struct hdd_config {
uint32_t ho_delay_for_rx;
uint32_t min_delay_btw_roam_scans;
uint32_t roam_trigger_reason_bitmask;
- uint32_t roam_bg_scan_client_bitmap;
-
bool apf_enabled;
bool adaptive_dwell_mode_enabled;
enum scan_dwelltime_adaptive_mode extscan_adaptive_dwell_mode;
@@ -2234,7 +2205,6 @@ struct hdd_config {
uint8_t adapt_dwell_lpf_weight;
uint8_t adapt_dwell_passive_mon_intval;
uint8_t adapt_dwell_wifi_act_threshold;
- bool bug_report_for_no_scan_results;
uint16_t sap_tx_leakage_threshold;
bool sap_internal_restart;
enum active_apf_mode active_uc_apf_mode;
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 98a1bd8146..4f41f39dcf 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -441,13 +441,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_ROAM_SCAN_TRIGGER_REASON_BITMASK_MIN,
CFG_ROAM_SCAN_TRIGGER_REASON_BITMASK_MAX),
- REG_VARIABLE(CFG_CREATE_BUG_REPORT_FOR_SCAN, WLAN_PARAM_Integer,
- struct hdd_config, bug_report_for_no_scan_results,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_CREATE_BUG_REPORT_FOR_SCAN_DEFAULT,
- CFG_CREATE_BUG_REPORT_FOR_SCAN_DISABLE,
- CFG_CREATE_BUG_REPORT_FOR_SCAN_ENABLE),
-
REG_VARIABLE(CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_NAME, WLAN_PARAM_Integer,
struct hdd_config, extscan_adaptive_dwell_mode,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 7f7d205bfe..4ed152511a 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -1077,7 +1077,6 @@ typedef struct tagCsrConfigParam {
uint8_t conc_custom_rule2;
uint8_t is_sta_connection_in_5gz_enabled;
- int8_t first_scan_bucket_threshold;
uint8_t max_intf_count;
uint32_t f_sta_miracast_mcc_rest_time_val;
#ifdef FEATURE_AP_MCC_CH_AVOIDANCE
@@ -1089,7 +1088,6 @@ typedef struct tagCsrConfigParam {
uint32_t roam_dense_min_aps;
int8_t roam_bg_scan_bad_rssi_thresh;
uint8_t roam_bad_rssi_thresh_offset_2g;
- uint32_t roam_bg_scan_client_bitmap;
struct csr_sta_roam_policy_params sta_roam_policy_params;
bool enable_bcast_probe_rsp;
bool is_fils_enabled;
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 3b5fcab44a..756bbc7cae 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -2737,8 +2737,6 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam
pParam->roam_bg_scan_bad_rssi_thresh =
cfg_params->roam_params.bg_scan_bad_rssi_thresh;
- pParam->roam_bg_scan_client_bitmap =
- cfg_params->roam_params.bg_scan_client_bitmap;
pParam->roam_bad_rssi_thresh_offset_2g =
cfg_params->roam_params.roam_bad_rssi_thresh_offset_2g;