diff --git a/platformio.ini b/platformio.ini
index 3f17b80a4..0d62d976a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -75,7 +75,7 @@ platform = espressif8266
 framework = arduino
 board = esp12e
 upload_speed=460800
-build_flags = -Wl,-Tesp8266.flash.1m128.ld -D PLUGIN_BUILD_NORMAL -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV -D FEATURE_ARDUINO_OTA -D BUILD_GIT='"${env.TRAVIS_TAG}"'
+build_flags = -Wl,-Tesp8266.flash.1m128.ld -D PLUGIN_BUILD_NORMAL -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV -D BUILD_GIT='"${env.TRAVIS_TAG}"'
 
 #version with additional plugins (and dependend code) that is in development (probably broken or incomplete) 4096k
 [env:dev_4096]
@@ -83,7 +83,7 @@ platform = espressif8266
 framework = arduino
 board = esp12e
 upload_speed=460800
-build_flags = -Wl,-Tesp8266.flash.4m1m.ld -D PLUGIN_BUILD_NORMAL -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV -D FEATURE_ARDUINO_OTA -D BUILD_GIT='"${env.TRAVIS_TAG}"'
+build_flags = -Wl,-Tesp8266.flash.4m1m.ld -D PLUGIN_BUILD_NORMAL -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV -D BUILD_GIT='"${env.TRAVIS_TAG}"'
 
 #version with additional plugins (and dependend code) that is in development (probably broken or incomplete) 4096k for esp8285
 [env:dev_8285]
@@ -91,4 +91,4 @@ platform = espressif8266
 framework = arduino
 board = esp8285
 upload_speed=460800
-build_flags = -Wl,-Tesp8266.flash.1m128.ld -D PLUGIN_BUILD_NORMAL -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV -D FEATURE_ARDUINO_OTA -D BUILD_GIT='"${env.TRAVIS_TAG}"' -DESP8285
+build_flags = -Wl,-Tesp8266.flash.1m128.ld -D PLUGIN_BUILD_NORMAL -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV -D BUILD_GIT='"${env.TRAVIS_TAG}"' -DESP8285
diff --git a/src/ESPEasy.ino b/src/ESPEasy.ino
index 920789986..754108d4b 100644
--- a/src/ESPEasy.ino
+++ b/src/ESPEasy.ino
@@ -112,7 +112,6 @@
 
 //enable Arduino OTA updating.
 //Note: This adds around 10kb to the firmware size, and 1kb extra ram.
-//Normally only enabled for the platformio dev environment, since its helpfull while developing.
 // #define FEATURE_ARDUINO_OTA