diff --git a/code/platformio.custom.ini b/code/platformio.custom.ini
index c0d9115b..61c4c3f0 100644
--- a/code/platformio.custom.ini
+++ b/code/platformio.custom.ini
@@ -13,7 +13,7 @@ env_default = node-debug
 platform = espressif8266
 framework = arduino
 extra_script = pio_hooks.py
-lib_ignore = FauxmoESP
+lib_ignore = FauxmoESP, ESPAsyncUDP
 lib_deps =
     DHT sensor library
     Adafruit Unified Sensor
diff --git a/code/platformio.ini b/code/platformio.ini
index 9e070746..9b5d699b 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -19,15 +19,36 @@ lib_deps =
     https://bitbucket.org/xoseperez/emonliteesp.git
     https://bitbucket.org/xoseperez/fauxmoESP.git
     https://github.com/jccprj/RemoteSwitch-arduino-library
+lib_ignore = FauxmoESP, ESPAsyncUDP
+
+[env:node-debug]
+platform = espressif8266_stage
+framework = arduino
+lib_deps = ${common.lib_deps}
+extra_script = pio_hooks.py
+board = nodemcuv2
+build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial -DENABLE_FAUXMO=1
+
+[env:node-debug-ota]
+platform = espressif8266
+framework = arduino
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+extra_script = pio_hooks.py
+board = nodemcuv2
+build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial
+upload_speed = 115200
+upload_port = "192.168.4.1"
+upload_flags = --auth=fibonacci --port 8266
 
 [env:sonoff-debug]
 platform = espressif8266
 framework = arduino
 lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
-lib_ignore = FauxmoESP
 
 [env:sonoff-debug-ota]
 platform = espressif8266
@@ -39,7 +60,7 @@ build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
-lib_ignore = FauxmoESP
+lib_ignore = ${common.lib_ignore}
 
 [env:sonoff-pow-debug]
 platform = espressif8266
@@ -48,7 +69,7 @@ lib_deps = ${common.lib_deps}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF_POW
-lib_ignore = FauxmoESP
+lib_ignore = ${common.lib_ignore}
 
 [env:sonoff-pow-debug-ota]
 platform = espressif8266
@@ -60,7 +81,7 @@ build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF_POW
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
-lib_ignore = FauxmoESP
+lib_ignore = ${common.lib_ignore}
 
 [env:slampher-debug]
 platform = espressif8266
@@ -69,7 +90,7 @@ lib_deps = ${common.lib_deps}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSLAMPHER
-lib_ignore = FauxmoESP
+lib_ignore = ${common.lib_ignore}
 
 [env:slampher-debug-ota]
 platform = espressif8266
@@ -81,7 +102,7 @@ build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSLAMPHER
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
-lib_ignore = FauxmoESP
+lib_ignore = ${common.lib_ignore}
 
 [env:s20-debug]
 platform = espressif8266
@@ -90,39 +111,19 @@ lib_deps = ${common.lib_deps}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20
-lib_ignore = FauxmoESP
+lib_ignore = ${common.lib_ignore}
 
 [env:s20-debug-ota]
 platform = espressif8266
 framework = arduino
 lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20
 upload_speed = 115200
 upload_port = "192.168.4.1"
-lib_ignore = FauxmoESP
-upload_flags = --auth=fibonacci --port 8266
-
-[env:node-debug]
-platform = espressif8266_stage
-framework = arduino
-lib_deps = ${common.lib_deps}
-extra_script = pio_hooks.py
-board = nodemcuv2
-build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial -DENABLE_FAUXMO=1
-
-[env:node-debug-ota]
-platform = espressif8266
-framework = arduino
-lib_deps = ${common.lib_deps}
-extra_script = pio_hooks.py
-board = nodemcuv2
-build_flags = -g -DNODEMCUV2 -DDEBUG_PORT=Serial
-upload_speed = 115200
-upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
-lib_ignore = FauxmoESP
 
 
 
@@ -131,49 +132,49 @@ topic = /home/cellar/airconditioner/ip
 platform = espressif8266
 framework = arduino
 lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
-lib_ignore = FauxmoESP
 
 [env:washer-device]
 topic = /home/cellar/washer/ip
 platform = espressif8266
 framework = arduino
 lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
 board = esp01_1m
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_EMON=1 -DENABLE_DHT=1
-lib_ignore = FauxmoESP
 
 [env:studio-lamp-device]
 topic = /home/studio/lamp/ip
 platform = espressif8266_stage
 framework = arduino
 lib_deps = ${common.lib_deps}
+lib_ignore =
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_FAUXMO=1
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
-lib_ignore =
 
 [env:living-lamp-device]
 topic = /home/living/lamp/ip
 platform = espressif8266
 framework = arduino
 lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -g -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
-lib_ignore = FauxmoESP