diff --git a/DMRSlot.cpp b/DMRSlot.cpp
index 8a9abf4..0b55b67 100644
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "DMRAccessControl.h"
+#include "DMRDataHeader.h"
 #include "DMRSlotType.h"
 #include "DMRShortLC.h"
 #include "DMRTrellis.h"
@@ -83,8 +84,6 @@ m_netEmbeddedWriteN(1U),
 m_netTalkerId(TALKER_ID_NONE),
 m_rfLC(NULL),
 m_netLC(NULL),
-m_rfDataHeader(),
-m_netDataHeader(),
 m_rfSeqNo(0U),
 m_netSeqNo(0U),
 m_rfN(0U),
@@ -365,8 +364,6 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
 
 			m_rfFrames = dataHeader.getBlocks();
 
-			m_rfDataHeader = dataHeader;
-
 			m_rfSeqNo  = 0U;
 
 			m_rfLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId);
@@ -1179,8 +1176,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 			return;
 		}
 
-		m_netDataHeader = dataHeader;
-
 		bool gi = dataHeader.getGI();
 		unsigned int srcId = dataHeader.getSrcId();
 		unsigned int dstId = dataHeader.getDstId();
diff --git a/DMRSlot.h b/DMRSlot.h
index cde13a9..657de80 100644
--- a/DMRSlot.h
+++ b/DMRSlot.h
@@ -21,7 +21,6 @@
 
 #include "RSSIInterpolator.h"
 #include "DMREmbeddedData.h"
-#include "DMRDataHeader.h"
 #include "DMRNetwork.h"
 #include "RingBuffer.h"
 #include "StopWatch.h"
@@ -69,8 +68,6 @@ private:
 	unsigned char              m_netTalkerId;
 	CDMRLC*                    m_rfLC;
 	CDMRLC*                    m_netLC;
-	CDMRDataHeader             m_rfDataHeader;
-	CDMRDataHeader             m_netDataHeader;
 	unsigned char              m_rfSeqNo;
 	unsigned char              m_netSeqNo;
 	unsigned char              m_rfN;