diff --git a/components/lwip/port/debug/lwip_debug.c b/components/lwip/port/debug/lwip_debug.c
index 06b4b363588..b747d8199a9 100644
--- a/components/lwip/port/debug/lwip_debug.c
+++ b/components/lwip/port/debug/lwip_debug.c
@@ -87,9 +87,6 @@ static void dbg_lwip_tcp_pcb_one_show(struct tcp_pcb* pcb)
     ESP_LWIP_LOGI("rttest=%" PRIu32 " rtseq=%" PRIu32 " sa=%d sv=%d", pcb->rttest, pcb->rtseq, pcb->sa, pcb->sv);
     ESP_LWIP_LOGI("rto=%d nrtx=%d", pcb->rto, pcb->nrtx);
     ESP_LWIP_LOGI("dupacks=%d lastack=%" PRIu32, pcb->dupacks, pcb->lastack);
-#if ESP_PER_SOC_TCP_WND
-    ESP_LWIP_LOGI("per_soc_window=%d per_soc_snd_buf=%d", pcb->per_soc_tcp_wnd, pcb->per_soc_tcp_snd_buf);
-#endif
     ESP_LWIP_LOGI("cwnd=%"TCPWNDSIZE_F" ssthreash=%"TCPWNDSIZE_F, pcb->cwnd, pcb->ssthresh);
     ESP_LWIP_LOGI("snd_next=%" PRIu32 " snd_wl1=%" PRIu32 " snd_wl2=%" PRIu32, pcb->snd_nxt, pcb->snd_wl1, pcb->snd_wl2);
     ESP_LWIP_LOGI("snd_lbb=%" PRIu32 " snd_wnd=%"TCPWNDSIZE_F" snd_wnd_max=%"TCPWNDSIZE_F, pcb->snd_lbb, pcb->snd_wnd, pcb->snd_wnd_max);
diff --git a/components/lwip/port/freertos/sys_arch.c b/components/lwip/port/freertos/sys_arch.c
index b0ef0790d24..02c5674492c 100644
--- a/components/lwip/port/freertos/sys_arch.c
+++ b/components/lwip/port/freertos/sys_arch.c
@@ -43,11 +43,11 @@ sys_mutex_new(sys_mutex_t *pxMutex)
 {
   *pxMutex = xSemaphoreCreateMutex();
   if (*pxMutex == NULL) {
-    LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sys_mutex_new: out of mem\r\n"));
+    LWIP_DEBUGF(SYS_DEBUG, ("sys_mutex_new: out of mem\r\n"));
     return ERR_MEM;
   }
 
-  LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sys_mutex_new: m=%p\n", *pxMutex));
+  LWIP_DEBUGF(SYS_DEBUG, ("sys_mutex_new: m=%p\n", *pxMutex));
 
   return ERR_OK;
 }
@@ -88,7 +88,7 @@ sys_mutex_unlock(sys_mutex_t *pxMutex)
 void
 sys_mutex_free(sys_mutex_t *pxMutex)
 {
-  LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sys_mutex_free: m=%p\n", *pxMutex));
+  LWIP_DEBUGF(SYS_DEBUG, ("sys_mutex_free: m=%p\n", *pxMutex));
   vSemaphoreDelete(*pxMutex);
   *pxMutex = NULL;
 }
@@ -110,7 +110,7 @@ sys_sem_new(sys_sem_t *sem, u8_t count)
 
   *sem = xSemaphoreCreateBinary();
   if (*sem == NULL) {
-      LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sys_sem_new: out of mem\r\n"));
+      LWIP_DEBUGF(SYS_DEBUG, ("sys_sem_new: out of mem\r\n"));
       return ERR_MEM;
   }
 
@@ -207,19 +207,19 @@ sys_mbox_new(sys_mbox_t *mbox, int size)
 {
   *mbox = mem_malloc(sizeof(struct sys_mbox_s));
   if (*mbox == NULL){
-    LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("fail to new *mbox\n"));
+    LWIP_DEBUGF(SYS_DEBUG, ("fail to new *mbox\n"));
     return ERR_MEM;
   }
 
   (*mbox)->os_mbox = xQueueCreate(size, sizeof(void *));
 
   if ((*mbox)->os_mbox == NULL) {
-    LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("fail to new (*mbox)->os_mbox\n"));
+    LWIP_DEBUGF(SYS_DEBUG, ("fail to new (*mbox)->os_mbox\n"));
     mem_free(*mbox);
     return ERR_MEM;
   }
 
-  LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("new *mbox ok mbox=%p os_mbox=%p\n", *mbox, (*mbox)->os_mbox));
+  LWIP_DEBUGF(SYS_DEBUG, ("new *mbox ok mbox=%p os_mbox=%p\n", *mbox, (*mbox)->os_mbox));
   return ERR_OK;
 }
 
@@ -252,7 +252,7 @@ sys_mbox_trypost(sys_mbox_t *mbox, void *msg)
   if (xQueueSend((*mbox)->os_mbox, &msg, 0) == pdTRUE) {
     xReturn = ERR_OK;
   } else {
-    LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("trypost mbox=%p fail\n", (*mbox)->os_mbox));
+    LWIP_DEBUGF(SYS_DEBUG, ("trypost mbox=%p fail\n", (*mbox)->os_mbox));
     xReturn = ERR_MEM;
   }
 
@@ -481,7 +481,7 @@ sys_thread_sem_get(void)
   if (!sem) {
       sem = sys_thread_sem_init();
   }
-  LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sem_get s=%p\n", sem));
+  LWIP_DEBUGF(SYS_DEBUG, ("sem_get s=%p\n", sem));
   return sem;
 }
 
@@ -491,12 +491,12 @@ sys_thread_sem_free(void* data) // destructor for TLS semaphore
   sys_sem_t *sem = (sys_sem_t*)(data);
 
   if (sem && *sem){
-    LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sem del, sem=%p\n", *sem));
+    LWIP_DEBUGF(SYS_DEBUG, ("sem del, sem=%p\n", *sem));
     vSemaphoreDelete(*sem);
   }
 
   if (sem) {
-    LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sem pointer del, sem_p=%p\n", sem));
+    LWIP_DEBUGF(SYS_DEBUG, ("sem pointer del, sem_p=%p\n", sem));
     mem_free(sem);
   }
 }
diff --git a/components/lwip/port/include/lwipopts.h b/components/lwip/port/include/lwipopts.h
index bb35e6a8c55..9bbfa17a783 100644
--- a/components/lwip/port/include/lwipopts.h
+++ b/components/lwip/port/include/lwipopts.h
@@ -1669,11 +1669,10 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 #define ESP_MLDV6_REPORT              0
 #endif
 
+#define SYS_DEBUG                       LWIP_DBG_OFF
+
 #define ESP_LWIP                        1
 #define ESP_LWIP_ARP                    1
-#define ESP_PER_SOC_TCP_WND             0
-#define ESP_THREAD_SAFE                 1       /* Not used (to be removed in v6.x) */
-#define ESP_THREAD_SAFE_DEBUG           LWIP_DBG_OFF
 #define ESP_DHCP                        1
 #define ESP_DNS                         1
 #define ESP_STATS_TCP                   0