diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index a33e0c8d6..7d6d98213 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -713,18 +713,16 @@ int cliGps(const char ** argv)
 {
   int baudrate = 0;
   
-#if defined(DEBUG)
   if (argv[1][0] == '$') {
     // send command to GPS
     gpsSendFrame(argv[1]);
   }
+#if defined(DEBUG)
   else if (!strcmp(argv[1], "trace")) {
     gpsTraceEnabled = !gpsTraceEnabled;
   }
-  else
 #endif
-  
-  if (toInt(argv, 1, &baudrate) > 0 && baudrate > 0) {
+  else if (toInt(argv, 1, &baudrate) > 0 && baudrate > 0) {
     gpsInit(baudrate);
     serialPrint("GPS baudrate set to %d", baudrate);
   }
diff --git a/radio/src/gps.cpp b/radio/src/gps.cpp
index 97091a7af..5a62fb5ac 100644
--- a/radio/src/gps.cpp
+++ b/radio/src/gps.cpp
@@ -322,7 +322,6 @@ void gpsWakeup()
   }
 }
 
-#if defined(DEBUG)
 char hex(uint8_t b) {
   return b > 9 ? b + 'A' - 10 : b + '0';
 }
@@ -344,5 +343,3 @@ void gpsSendFrame(const char * frame)
   gpsSendByte('\n');
   TRACE("*%02x", parity);
 }
-
-#endif // #if defined(DEBUG)
diff --git a/radio/src/gps.h b/radio/src/gps.h
index 0c1b9d3ab..5d8bd9c19 100644
--- a/radio/src/gps.h
+++ b/radio/src/gps.h
@@ -40,8 +40,6 @@ struct gpsdata_t
 extern gpsdata_t gpsData;
 void gpsWakeup();
 
-#if defined(DEBUG)
 void gpsSendFrame(const char * frame);
-#endif
 
 #endif // _GPS_H_
diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
index e02d14fad..d65e3763b 100644
--- a/radio/src/targets/horus/board.h
+++ b/radio/src/targets/horus/board.h
@@ -403,9 +403,9 @@ void hapticOn(uint32_t pwmPercent);
 void gpsInit(uint32_t baudrate);
 uint8_t gpsGetByte(uint8_t * byte);
 #if defined(DEBUG)
-  extern uint8_t gpsTraceEnabled;
-  void gpsSendByte(uint8_t byte);
+extern uint8_t gpsTraceEnabled;
 #endif
+void gpsSendByte(uint8_t byte);
 
 // Second serial port driver
 #define SERIAL2
diff --git a/radio/src/targets/horus/gps_driver.cpp b/radio/src/targets/horus/gps_driver.cpp
index c9805ee42..37c6fa046 100644
--- a/radio/src/targets/horus/gps_driver.cpp
+++ b/radio/src/targets/horus/gps_driver.cpp
@@ -62,6 +62,8 @@ void gpsInit(uint32_t baudrate)
 
 #if defined(DEBUG)
 uint8_t gpsTraceEnabled = false;
+#endif
+
 Fifo<uint8_t, 64> gpsTxFifo;
 
 void gpsSendByte(uint8_t byte)
@@ -71,12 +73,8 @@ void gpsSendByte(uint8_t byte)
   USART_ITConfig(GPS_USART, USART_IT_TXE, ENABLE);
 }
 
-#endif // #if defined(DEBUG)
-
-
 extern "C" void GPS_USART_IRQHandler(void)
 {
-#if defined(DEBUG)
   // Send
   if (USART_GetITStatus(GPS_USART, USART_IT_TXE) != RESET) {
     uint8_t txchar;
@@ -88,7 +86,6 @@ extern "C" void GPS_USART_IRQHandler(void)
       USART_ITConfig(GPS_USART, USART_IT_TXE, DISABLE);
     }
   }
-#endif
 
   // Receive
   uint32_t status = GPS_USART->SR;