diff --git a/code/espurna/config/all.h b/code/espurna/config/all.h
index 36442202..dfa31e3f 100644
--- a/code/espurna/config/all.h
+++ b/code/espurna/config/all.h
@@ -34,5 +34,3 @@
 #ifdef USE_CORE_VERSION_H
 #include "core_version.h"
 #endif
-
-#include "build.h"
diff --git a/code/espurna/mdns.ino b/code/espurna/mdns.ino
index be9ea215..c82f328a 100644
--- a/code/espurna/mdns.ino
+++ b/code/espurna/mdns.ino
@@ -67,9 +67,6 @@ void mdnsServerSetup() {
         itoa(ESP.getFreeSketchSpace(), buffer, 10);
         MDNS.addServiceTxt("arduino", "tcp", "free_space", (const char *) buffer);
     }
-    #ifdef APP_BUILD_FLAGS
-        //MDNS.addServiceTxt("arduino", "tcp", "build_flags", APP_BUILD_FLAGS);
-    #endif
 
     wifiRegister([](justwifi_messages_t code, char * parameter) {
 
diff --git a/code/espurna/utils.ino b/code/espurna/utils.ino
index 74ece067..83dbf4de 100644
--- a/code/espurna/utils.ino
+++ b/code/espurna/utils.ino
@@ -259,9 +259,6 @@ void info() {
 
     // -------------------------------------------------------------------------
 
-    #ifdef APP_BUILD_FLAGS
-        DEBUG_MSG_P(PSTR("[INIT] BUILD_FLAGS: %s\n"), APP_BUILD_FLAGS);
-    #endif
     DEBUG_MSG_P(PSTR("[INIT] BOARD: %s\n"), getBoardName().c_str());
     DEBUG_MSG_P(PSTR("[INIT] SUPPORT:"));
 
diff --git a/code/extra_scripts.py b/code/extra_scripts.py
index 36f870af..1cb1ed4c 100644
--- a/code/extra_scripts.py
+++ b/code/extra_scripts.py
@@ -58,18 +58,6 @@ def check_size(source, target, env):
     #    print clr(Color.LIGHT_RED, "File too large for OTA!")
     #    Exit(1)
 
-def add_build_flags(source, target, env):
-    build_h = "espurna/config/build.h"
-    build_flags = env['BUILD_FLAGS'][0]
-    lines = open(build_h).readlines()
-    with open(build_h, "w") as fh:
-        for line in lines:
-            if "APP_BUILD_FLAGS" in line:
-                fh.write("#define APP_BUILD_FLAGS \"%s\"" % build_flags)
-            else:
-                fh.write(line)
-
-
 # ------------------------------------------------------------------------------
 # Hooks
 # ------------------------------------------------------------------------------
@@ -77,5 +65,4 @@ def add_build_flags(source, target, env):
 remove_float_support()
 
 #env.AddPreAction("buildprog", cpp_check)
-env.AddPreAction("$BUILD_DIR/src/espurna.ino.o", add_build_flags)
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", check_size)