diff --git a/src/main.c b/src/main.c
index d755915..a792abe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -212,7 +212,7 @@ int main(int argc, char **argv) {
     pthread_create(&tid_probe, NULL, &remove_array_thread, NULL);
     pthread_create(&tid_client, NULL, &remove_client_array_thread, NULL);
     pthread_create(&tid_get_client, NULL, &update_clients_thread, NULL);
-    pthread_create(&tid_kick_clients, NULL, &kick_clients_thread, NULL);
+    //pthread_create(&tid_kick_clients, NULL, &kick_clients_thread, NULL);
     pthread_create(&tid_ap, NULL, &remove_ap_array_thread, NULL);
 
     //pthread_create(&tid, NULL, &remove_thread, NULL);
diff --git a/src/storage/datastorage.c b/src/storage/datastorage.c
index e26ef3c..e7c94fa 100644
--- a/src/storage/datastorage.c
+++ b/src/storage/datastorage.c
@@ -45,21 +45,10 @@ int eval_probe_metric(struct probe_entry_s probe_entry) {
     // check if ap entry is available
     if(mac_is_equal(ap_entry.bssid_addr, probe_entry.bssid_addr)) {
         score += probe_entry.ht_support ? dawn_metric.ht_support : 0;
-        //score += !probe_entry.ht_support && !ap_entry.ht ? dawn_metric.n_ht_support : 0;
+        score += !probe_entry.ht_support && !ap_entry.ht ? dawn_metric.no_ht_support : 0;
         score += probe_entry.vht_support ? dawn_metric.vht_support : 0;
-        //score += !probe_entry.vht_support && !ap_entry.vht ? dawn_metric.n_vht_support : 0;
+        score += !probe_entry.vht_support && !ap_entry.vht ? dawn_metric.no_vht_support : 0;
 
-    } else {
-        char mac_buf_probe[20];
-        char mac_buf_ap[20];
-        sprintf(mac_buf_probe, "%x:%x:%x:%x:%x:%x", MAC2STR(probe_entry.bssid_addr));
-        sprintf(mac_buf_ap, "%x:%x:%x:%x:%x:%x", MAC2STR(ap_entry.bssid_addr));
-        printf("\nNOOOOOOOOOOOOOOOOOO AP!!! AP: %s, Probe: %s\n", mac_buf_ap, mac_buf_probe);
-        print_probe_entry(probe_entry);
-        // maybe don't score vht and ht if no ap is available
-
-        //score += probe_entry.ht_support ? dawn_metric.vht_support : dawn_metric.n_vht_support;
-        //score += probe_entry.vht_support ? dawn_metric.ht_support : dawn_metric.n_ht_support;
     }
 
     //score += probe_entry.ht_support ? dawn_metric.ht_support : 0;
diff --git a/src/utils/ubus.c b/src/utils/ubus.c
index d7aba38..d8edd34 100644
--- a/src/utils/ubus.c
+++ b/src/utils/ubus.c
@@ -140,10 +140,10 @@ static int decide_function(probe_entry *prob_req) {
         return 0;
     }
 
-    if(better_ap_available(prob_req->bssid_addr, prob_req->client_addr))
+    /*if(better_ap_available(prob_req->bssid_addr, prob_req->client_addr))
     {
         return 0;
-    }
+    }*/
 
     return 1;
 }