diff --git a/radio/src/Makefile b/radio/src/Makefile
index b73cf975f..d982cb7fb 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1789,12 +1789,6 @@ stamp.h:
 	@echo "#define TIME    \"`date +%H:%M:%S | tr -d '\r\n'`\"" >> stamp.h
 	@echo "#define VERSION \"$(VERSION)\"" >> stamp.h
 
-opentx-stamp:
-	@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx.txt
-	@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx.txt
-	@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx.txt
-	@cat stamp-opentx.txt
-
 translations/en.h: translations/en.h.txt
 	@echo
 	@echo "Create English language specific header files"
diff --git a/radio/src/debug.cpp b/radio/src/debug.cpp
index 8ef5baafc..e5f8d8a11 100644
--- a/radio/src/debug.cpp
+++ b/radio/src/debug.cpp
@@ -97,7 +97,7 @@ const struct TraceElement * getTraceElement(uint16_t idx)
 
 void dumpTraceBuffer()
 {
-  TRACE("Dump of Trace Buffer (" VERS_STR " " DATE_STR " " TIME_STR "):");
+  TRACE("Dump of Trace Buffer (" VERSION " " DATE " " TIME "):");
   TRACE("#   Time                     Event  Data");
   for(int n = 0; n < TRACE_BUFFER_LEN; ++n) {
     struct gtm tp;
diff --git a/radio/src/gui/Horus/view_statistics.cpp b/radio/src/gui/Horus/view_statistics.cpp
index 07de7d819..3c6c364d7 100644
--- a/radio/src/gui/Horus/view_statistics.cpp
+++ b/radio/src/gui/Horus/view_statistics.cpp
@@ -175,7 +175,7 @@ bool menuTraceBuffer(evt_t event)
       break;
   }
 
-  SIMPLE_SUBMENU("Trace Buffer " VERS_STR, TRACE_BUFFER_LEN);
+  SIMPLE_SUBMENU("Trace Buffer " VERSION, TRACE_BUFFER_LEN);
 
   /* RTC time */
   struct gtm t;
diff --git a/radio/src/gui/Taranis/view_statistics.cpp b/radio/src/gui/Taranis/view_statistics.cpp
index 7d8dc0da7..09b10b396 100644
--- a/radio/src/gui/Taranis/view_statistics.cpp
+++ b/radio/src/gui/Taranis/view_statistics.cpp
@@ -215,7 +215,7 @@ void menuTraceBuffer(uint8_t event)
       break;
   }
 
-  SIMPLE_SUBMENU("Trace Buffer " VERS_STR, TRACE_BUFFER_LEN);
+  SIMPLE_SUBMENU("Trace Buffer " VERSION, TRACE_BUFFER_LEN);
   /* RTC time */
   struct gtm t;
   gettime(&t);
diff --git a/radio/src/targets/Taranis/bootloader/boot.cpp b/radio/src/targets/Taranis/bootloader/boot.cpp
index f4d57be1f..7f599fcfc 100644
--- a/radio/src/targets/Taranis/bootloader/boot.cpp
+++ b/radio/src/targets/Taranis/bootloader/boot.cpp
@@ -62,11 +62,11 @@
 #include "FatFs/ff.h"
 #include "FatFs/diskio.h"
 #include "translations/en.h"
-#include "stamp-opentx.h"
+#include "stamp.h"
 #include "strhelpers.h"
 
 #if defined(PCBTARANIS)
-  #define BOOTLOADER_TITLE      " Taranis BootLoader - " VERS_STR
+  #define BOOTLOADER_TITLE      " Taranis BootLoader - " VERSION
   #if defined(REV9E)
     #define BOOT_KEY_UP		KEY_MINUS
     #define BOOT_KEY_DOWN	KEY_PLUS
@@ -80,7 +80,7 @@
   #define BOOT_KEY_EXIT		KEY_EXIT
   #define DISPLAY_CHAR_WIDTH	35
 #elif defined(PCBSKY9X)
-  #define BOOTLOADER_TITLE      "Sky9x Boot Loader - " VERS_STR
+  #define BOOTLOADER_TITLE      "Sky9x Boot Loader - " VERSION
 #endif
 
 const uint8_t bootloaderVersion[] __attribute__ ((section(".version"), used)) =