diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 90e44607..e4fa8e6c 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -1,7 +1,9 @@
+#include <ElegantOTA.h>
 #include <Arduino.h>
 #include <WiFi.h>
 #include <vector>
 #include "configuration.h"
+#include "battery_utils.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
 #include "syslog_utils.h"
@@ -17,8 +19,7 @@
 #include "tnc_utils.h"
 #include "display.h"
 #include "utils.h"
-#include <ElegantOTA.h>
-#include "battery_utils.h"
+
 
 Configuration   Config;
 WiFiClient      espClient;
diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp
index a1eac506..04cdd874 100644
--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -4,7 +4,6 @@
 #include "station_utils.h"
 #include "syslog_utils.h"
 #include "query_utils.h"
-//#include "lora_utils.h"
 #include "digi_utils.h"
 #include "display.h"
 #include "utils.h"
@@ -120,10 +119,8 @@ namespace APRS_IS_Utils {
             }
             if (Config.beacon.path == "") {
                 STATION_Utils::addToOutputPacketBuffer(Config.callsign + ">APLRG1,RFONLY::" + sender + ":" + ackMessage);
-                //LoRa_Utils::sendNewPacket(Config.callsign + ">APLRG1,RFONLY::" + sender + ":" + ackMessage);
             } else {
                 STATION_Utils::addToOutputPacketBuffer(Config.callsign + ">APLRG1,RFONLY," + Config.beacon.path + "::" + sender + ":" + ackMessage);
-                //LoRa_Utils::sendNewPacket(Config.callsign + ">APLRG1,RFONLY," + Config.beacon.path + "::" + sender + ":" + ackMessage);
             }
 
             receivedMessage = packet.substring(packet.indexOf(":") + 1, packet.indexOf("{"));
@@ -136,7 +133,6 @@ namespace APRS_IS_Utils {
                 display_toggle(true);
             }
             STATION_Utils::addToOutputPacketBuffer(QUERY_Utils::process(receivedMessage, sender, "LoRa"));
-            //LoRa_Utils::sendNewPacket(QUERY_Utils::process(receivedMessage, sender, "LoRa"));
             lastScreenOn = millis();
             show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, "Callsign = " + sender, "TYPE --> QUERY", 0);
             return true;
@@ -227,7 +223,6 @@ namespace APRS_IS_Utils {
 
                     if (Config.aprs_is.toRF && STATION_Utils::wasHeard(Addressee)) {
                         STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet));
-                        //LoRa_Utils::sendNewPacket(buildPacketToTx(packet));
                         display_toggle(true);
                         lastScreenOn = millis();
                         Utils::typeOfPacket(packet, "APRS-LoRa");
diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp
index 5624dfd7..be1aba04 100644
--- a/src/digi_utils.cpp
+++ b/src/digi_utils.cpp
@@ -3,7 +3,6 @@
 #include "station_utils.h"
 #include "aprs_is_utils.h"
 #include "query_utils.h"
-//#include "lora_utils.h"
 #include "digi_utils.h"
 #include "wifi_utils.h"
 #include "gps_utils.h"
@@ -77,8 +76,6 @@ namespace DIGI_Utils {
                         loraPacket = generateDigiRepeatedPacket(packet.substring(3), Config.callsign);
                         if (loraPacket != "") {
                             STATION_Utils::addToOutputPacketBuffer(loraPacket);
-                            //delay(500);
-                            //LoRa_Utils::sendNewPacket(loraPacket);
                             display_toggle(true);
                             lastScreenOn = millis();
                         }
diff --git a/src/tnc_utils.cpp b/src/tnc_utils.cpp
index 74f9213f..7297df2c 100644
--- a/src/tnc_utils.cpp
+++ b/src/tnc_utils.cpp
@@ -1,7 +1,6 @@
 #include <WiFi.h>
 #include "kiss_utils.h"
 #include "kiss_protocol.h"
-//#include "lora_utils.h"
 #include "configuration.h"
 #include "station_utils.h"
 #include "utils.h"
@@ -77,7 +76,6 @@ namespace TNC_Utils {
 
                 if (Config.tnc.acceptOwn || sender != Config.callsign) {
                     STATION_Utils::addToOutputPacketBuffer(frame);
-                    //LoRa_Utils::sendNewPacket(frame);
                 } else {
                     Utils::println("Ignored own frame from KISS");
                 }
diff --git a/src/utils.cpp b/src/utils.cpp
index 4a625801..e3846d8d 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -6,7 +6,6 @@
 #include "syslog_utils.h"
 #include "pins_config.h"
 #include "wifi_utils.h"
-#include "lora_utils.h"
 #include "gps_utils.h"
 #include "bme_utils.h"
 #include "display.h"
@@ -53,7 +52,7 @@ namespace Utils {
         if (statusAfterBoot && !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF) {
             delay(2000);
             status += ":>https://github.com/richonguzman/LoRa_APRS_iGate " + versionDate;
-            LoRa_Utils::sendNewPacket(status);
+            STATION_Utils::addToOutputPacketBuffer(status);
             statusAfterBoot = false;
         }
     }
@@ -130,18 +129,14 @@ namespace Utils {
 
             if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS) {
                 show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0); 
-                   
                 seventhLine = "     listening...";
-
                 APRS_IS_Utils::upload(beaconPacket);
             }
 
             if (Config.beacon.sendViaRF) {
                 show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING DIGI BEACON", 0);
-
                 seventhLine = "     listening...";
-
-                LoRa_Utils::sendNewPacket(secondaryBeaconPacket);
+                STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket);
             }
 
             lastBeaconTx = millis();