diff --git a/network/Network.cpp b/network/Network.cpp
index e8e7e7a8..39b0725c 100644
--- a/network/Network.cpp
+++ b/network/Network.cpp
@@ -544,7 +544,7 @@ bool Network::writeConfig()
     json::value v = json::value(config);
     std::string json = v.serialize();
 
-    char* buffer = new char[json.length() + 8U];
+    char buffer[json.length() + 8U];
 
     ::memcpy(buffer + 0U, TAG_REPEATER_CONFIG, 4U);
     __SET_UINT32(m_id, buffer, 4U);
@@ -554,9 +554,7 @@ bool Network::writeConfig()
         Utils::dump(1U, "Network Transmitted, Configuration", (uint8_t*)buffer, json.length() + 8U);
     }
 
-    bool ret = write((uint8_t*)buffer, json.length() + 8U);
-    delete[] buffer;
-    return ret;
+    return write((uint8_t*)buffer, json.length() + 8U);
 }
 
 /// <summary>
diff --git a/p25/dfsi/LC.cpp b/p25/dfsi/LC.cpp
index c8912872..b726b965 100644
--- a/p25/dfsi/LC.cpp
+++ b/p25/dfsi/LC.cpp
@@ -383,8 +383,7 @@ void LC::encodeLDU1(uint8_t* data, const uint8_t* imbe)
             break;
     }
 
-    uint8_t* dfsiFrame = new uint8_t[frameLength];
-    ::memset(dfsiFrame, 0x00U, frameLength);
+    uint8_t dfsiFrame[frameLength];
 
     dfsiFrame[0U] = m_frameType;                                                    // Frame Type
 
@@ -470,7 +469,6 @@ void LC::encodeLDU1(uint8_t* data, const uint8_t* imbe)
 #endif
 
     ::memcpy(data, dfsiFrame, frameLength);
-    delete[] dfsiFrame;
 }
 
 /// <summary>
@@ -621,8 +619,7 @@ void LC::encodeLDU2(uint8_t* data, const uint8_t* imbe)
             break;
     }
 
-    uint8_t* dfsiFrame = new uint8_t[frameLength];
-    ::memset(dfsiFrame, 0x00U, frameLength);
+    uint8_t dfsiFrame[frameLength];
 
     dfsiFrame[0U] = m_frameType;                                                    // Frame Type
 
@@ -710,7 +707,6 @@ void LC::encodeLDU2(uint8_t* data, const uint8_t* imbe)
 #endif
 
     ::memcpy(data, dfsiFrame, frameLength);
-    delete[] dfsiFrame;
 }
 
 /// <summary>
diff --git a/p25/packet/Data.cpp b/p25/packet/Data.cpp
index c2ba23b7..82660ae2 100644
--- a/p25/packet/Data.cpp
+++ b/p25/packet/Data.cpp
@@ -696,7 +696,7 @@ void Data::writeNet_PDU_Buffered()
     uint32_t bitLength = ((m_netDataHeader.getBlocksToFollow() + 1U) * P25_PDU_FEC_LENGTH_BITS) + P25_PREAMBLE_LENGTH_BITS;
     uint32_t offset = P25_PREAMBLE_LENGTH_BITS;
 
-    uint8_t* data = new uint8_t[bitLength / 8U];
+    uint8_t data[bitLength / 8U];
     ::memset(data, 0x00U, bitLength / 8U);
     uint8_t block[P25_PDU_FEC_LENGTH_BYTES];
     ::memset(block, 0x00U, P25_PDU_FEC_LENGTH_BYTES);
@@ -735,7 +735,6 @@ void Data::writeNet_PDU_Buffered()
     }
 
     writeRF_PDU(data, bitLength);
-    delete[] data;
 }
 
 /// <summary>
@@ -747,7 +746,7 @@ void Data::writeRF_PDU_Buffered()
     uint32_t bitLength = ((m_rfDataHeader.getBlocksToFollow() + 1U) * P25_PDU_FEC_LENGTH_BITS) + P25_PREAMBLE_LENGTH_BITS;
     uint32_t offset = P25_PREAMBLE_LENGTH_BITS;
 
-    uint8_t* data = new uint8_t[bitLength / 8U];
+    uint8_t data[bitLength / 8U];
     ::memset(data, 0x00U, bitLength / 8U);
     uint8_t block[P25_PDU_FEC_LENGTH_BYTES];
     ::memset(block, 0x00U, P25_PDU_FEC_LENGTH_BYTES);
@@ -786,7 +785,6 @@ void Data::writeRF_PDU_Buffered()
     }
 
     writeRF_PDU(data, bitLength);
-    delete[] data;
 }
 
 /// <summary>
@@ -803,7 +801,7 @@ void Data::writeRF_PDU_Reg_Response(uint8_t regType, uint32_t llId, ulong64_t ip
     uint32_t bitLength = (2U * P25_PDU_FEC_LENGTH_BITS) + P25_PREAMBLE_LENGTH_BITS;
     uint32_t offset = P25_PREAMBLE_LENGTH_BITS;
 
-    uint8_t* data = new uint8_t[bitLength / 8U];
+    uint8_t data[bitLength / 8U];
     ::memset(data, 0x00U, bitLength / 8U);
     uint8_t block[P25_PDU_FEC_LENGTH_BYTES];
     ::memset(block, 0x00U, P25_PDU_FEC_LENGTH_BYTES);
@@ -850,7 +848,6 @@ void Data::writeRF_PDU_Reg_Response(uint8_t regType, uint32_t llId, ulong64_t ip
     Utils::setBitRange(block, data, offset, P25_PDU_FEC_LENGTH_BITS);
 
     writeRF_PDU(data, bitLength);
-    delete[] data;
 }
 
 /// <summary>
@@ -868,7 +865,7 @@ void Data::writeRF_PDU_Ack_Response(uint8_t ackClass, uint8_t ackType, uint32_t
     uint32_t bitLength = (2U * P25_PDU_FEC_LENGTH_BITS) + P25_PREAMBLE_LENGTH_BITS;
     uint32_t offset = P25_PREAMBLE_LENGTH_BITS;
 
-    uint8_t* data = new uint8_t[bitLength / 8U];
+    uint8_t data[bitLength / 8U];
     ::memset(data, 0x00U, bitLength / 8U);
     uint8_t block[P25_PDU_FEC_LENGTH_BYTES];
     ::memset(block, 0x00U, P25_PDU_FEC_LENGTH_BYTES);
@@ -895,5 +892,4 @@ void Data::writeRF_PDU_Ack_Response(uint8_t ackClass, uint8_t ackType, uint32_t
     Utils::setBitRange(block, data, offset, P25_PDU_FEC_LENGTH_BITS);
 
     writeRF_PDU(data, bitLength, noNulls);
-    delete[] data;
 }