diff --git a/src/AsyncTCP.cpp b/src/AsyncTCP.cpp
index 6f3d6b5..9188098 100644
--- a/src/AsyncTCP.cpp
+++ b/src/AsyncTCP.cpp
@@ -215,8 +215,8 @@ void _asynctcpsock_task(void *)
         xSemaphoreGiveRecursive(_asyncsock_mutex);
     }
 
-    _asyncsock_service_task_handle = NULL;
     vTaskDelete(NULL);
+    _asyncsock_service_task_handle = NULL;
 }
 
 AsyncSocketBase::AsyncSocketBase()
@@ -482,12 +482,7 @@ bool AsyncClient::connect(IPAddress ip, uint16_t port)
 #endif
 
     //Serial.printf("DEBUG: connect to %08x port %d using IP... ", ip_addr, port);
-    errno = 0;
-#ifdef ESP_IDF_VERSION_MAJOR
-    r = lwip_connect(sockfd, (struct sockaddr*)&serveraddr, sizeof(serveraddr));
-#else
-    r = lwip_connect_r(sockfd, (struct sockaddr*)&serveraddr, sizeof(serveraddr));
-#endif
+    errno = 0; r = lwip_connect_r(sockfd, (struct sockaddr*)&serveraddr, sizeof(serveraddr));
     //Serial.printf("r=%d errno=%d\r\n", r, errno);
     if (r < 0 && errno != EINPROGRESS) {
         //Serial.println("\t(connect failed)");
@@ -740,11 +735,7 @@ void AsyncClient::_close(void)
     //Serial.print("AsyncClient::_close: "); Serial.println(_socket);
     xSemaphoreTakeRecursive(_asyncsock_mutex, (TickType_t)portMAX_DELAY);
     _conn_state = 0;
-#ifdef ESP_IDF_VERSION_MAJOR
-    lwip_close(_socket);
-#else
     lwip_close_r(_socket);
-#endif
     _socket = -1;
     xSemaphoreGiveRecursive(_asyncsock_mutex);
 
@@ -757,11 +748,7 @@ void AsyncClient::_error(int8_t err)
 {
     xSemaphoreTakeRecursive(_asyncsock_mutex, (TickType_t)portMAX_DELAY);
     _conn_state = 0;
-#ifdef ESP_IDF_VERSION_MAJOR
-    lwip_close(_socket);
-#else
     lwip_close_r(_socket);
-#endif
     _socket = -1;
     xSemaphoreGiveRecursive(_asyncsock_mutex);
 
@@ -972,22 +959,14 @@ void AsyncServer::begin()
     server.sin_addr.s_addr = (uint32_t) _addr;
     server.sin_port = htons(_port);
     if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0) {
-#ifdef ESP_IDF_VERSION_MAJOR
-        lwip_close(sockfd);
-#else
         lwip_close_r(sockfd);
-#endif
         log_e("bind error: %d - %s", errno, strerror(errno));
         return;
     }
 
     static uint8_t backlog = 5;
     if (listen(sockfd , backlog) < 0) {
-#ifdef ESP_IDF_VERSION_MAJOR
-        lwip_close(sockfd);
-#else
         lwip_close_r(sockfd);
-#endif
         log_e("listen error: %d - %s", errno, strerror(errno));
         return;
     }
@@ -1003,11 +982,7 @@ void AsyncServer::end()
 {
     if (_socket == -1) return;
     xSemaphoreTakeRecursive(_asyncsock_mutex, (TickType_t)portMAX_DELAY);
-#ifdef ESP_IDF_VERSION_MAJOR
-    lwip_close(_socket);
-#else
     lwip_close_r(_socket);
-#endif
     _socket = -1;
     xSemaphoreGiveRecursive(_asyncsock_mutex);
 }
@@ -1019,12 +994,7 @@ void AsyncServer::_sockIsReadable(void)
     if (_connect_cb) {
         struct sockaddr_in client;
         size_t cs = sizeof(struct sockaddr_in);
-        errno = 0;
-#ifdef ESP_IDF_VERSION_MAJOR
-        int accepted_sockfd = lwip_accept(_socket, (struct sockaddr *)&client, (socklen_t*)&cs);
-#else
-        int accepted_sockfd = lwip_accept_r(_socket, (struct sockaddr *)&client, (socklen_t*)&cs);
-#endif
+        errno = 0; int accepted_sockfd = lwip_accept_r(_socket, (struct sockaddr *)&client, (socklen_t*)&cs);
         //Serial.printf("\t new sockfd=%d errno=%d\r\n", accepted_sockfd, errno);
         if (accepted_sockfd < 0) {
             log_e("accept error: %d - %s", errno, strerror(errno));