diff --git a/NXDNCRC.cpp b/NXDNCRC.cpp
index 7ffc456..60278ae 100644
--- a/NXDNCRC.cpp
+++ b/NXDNCRC.cpp
@@ -104,7 +104,7 @@ bool CNXDNCRC::checkCRC15(const unsigned char* in, unsigned int length)
 	temp1[0U] = (crc >> 8) & 0xFFU;
 	temp1[1U] = (crc >> 0) & 0xFFU;
 
-	uint16_t temp2[2U];
+	uint8_t temp2[2U];
 	temp2[0U] = 0x00U;
 	temp2[1U] = 0x00U;
 	unsigned int j = length;
diff --git a/NXDNFACCH1.cpp b/NXDNFACCH1.cpp
index 54aceaa..2cc2c42 100644
--- a/NXDNFACCH1.cpp
+++ b/NXDNFACCH1.cpp
@@ -21,7 +21,6 @@
 #include "NXDNConvolution.h"
 #include "NXDNDefines.h"
 #include "NXDNCRC.h"
-#include "Utils.h"
 
 #include <cstdio>
 #include <cassert>
@@ -71,8 +70,6 @@ bool CNXDNFACCH1::decode(const unsigned char* data, unsigned int offset)
 {
 	assert(data != NULL);
 
-	// CUtils::dump("NXDN, FACCH1 input", data, 18U);
-
 	unsigned char temp1[18U];
 
 	for (unsigned int i = 0U; i < NXDN_FACCH1_LENGTH_BITS; i++) {
@@ -81,8 +78,6 @@ bool CNXDNFACCH1::decode(const unsigned char* data, unsigned int offset)
 		WRITE_BIT1(temp1, i, b);
 	}
 
-	// CUtils::dump("NXDN, FACCH1 de-interleaved", temp1, 18U);
-
 	uint8_t temp2[210U];
 
 	unsigned int n = 0U;
@@ -114,8 +109,6 @@ bool CNXDNFACCH1::decode(const unsigned char* data, unsigned int offset)
 
 	conv.chainback(m_data, 96U);
 
-	// CUtils::dump("NXDN, FACCH1 decoded", m_data, 12U);
-
 	return CNXDNCRC::checkCRC12(m_data, 80U);
 }
 
@@ -129,15 +122,11 @@ void CNXDNFACCH1::encode(unsigned char* data, unsigned int offset) const
 
 	CNXDNCRC::encodeCRC12(temp1, 80U);
 
-	// CUtils::dump("NXDN, FACCH1 encoded with CRC", temp1, 12U);
-
 	unsigned char temp2[24U];
 
 	CNXDNConvolution conv;
 	conv.encode(temp1, temp2, 96U);
 
-	// CUtils::dump("NXDN, FACCH1 convolved", temp2, 24U);
-
 	unsigned char temp3[18U];
 
 	unsigned int n = 0U;
@@ -152,8 +141,6 @@ void CNXDNFACCH1::encode(unsigned char* data, unsigned int offset) const
 		}
 	}
 
-	// CUtils::dump("NXDN, FACCH1 punctured", temp3, 18U);
-
 	for (unsigned int i = 0U; i < NXDN_FACCH1_LENGTH_BITS; i++) {
 		unsigned int n = INTERLEAVE_TABLE[i] + offset;
 		bool b = READ_BIT1(temp3, i);
diff --git a/NXDNLICH.cpp b/NXDNLICH.cpp
index b137b8d..976ba02 100644
--- a/NXDNLICH.cpp
+++ b/NXDNLICH.cpp
@@ -18,7 +18,6 @@
 
 #include "NXDNDefines.h"
 #include "NXDNLICH.h"
-#include "Log.h"
 
 #include <cstdio>
 #include <cassert>
@@ -61,8 +60,6 @@ bool CNXDNLICH::decode(const unsigned char* bytes)
 
 	bool parity = b[7U] ^ b[6U] ^ b[5U] ^ b[4U];
 
-	// LogMessage("NXDN, LICH bits: %d%d %d%d %d%d %d - %d, parity: %d", b[7U] ? 1 : 0, b[6U] ? 1 : 0, b[5U] ? 1 : 0, b[4U] ? 1 : 0, b[3U] ? 1 : 0, b[2U] ? 1 : 0, b[1U] ? 1 : 0, b[0U] ? 1 : 0, parity ? 1 : 0);
-
 	if (parity != b[0U])
 		return false;
 
diff --git a/NXDNSACCH.cpp b/NXDNSACCH.cpp
index 1e490c2..c273799 100755
--- a/NXDNSACCH.cpp
+++ b/NXDNSACCH.cpp
@@ -21,7 +21,6 @@
 #include "NXDNConvolution.h"
 #include "NXDNDefines.h"
 #include "NXDNCRC.h"
-#include "Utils.h"
 
 #include <cstdio>
 #include <cassert>
@@ -64,8 +63,6 @@ bool CNXDNSACCH::decode(const unsigned char* data)
 {
 	assert(data != NULL);
 
-	// CUtils::dump("NXDN, SACCH input", data, 12U);
-
 	unsigned char temp1[8U];
 
 	for (unsigned int i = 0U; i < NXDN_SACCH_LENGTH_BITS; i++) {
@@ -74,8 +71,6 @@ bool CNXDNSACCH::decode(const unsigned char* data)
 		WRITE_BIT1(temp1, i, b);
 	}
 
-	// CUtils::dump("NXDN, SACCH de-interleaved", temp1, 8U);
-
 	uint8_t temp2[90U];
 
 	unsigned int n = 0U;
@@ -107,8 +102,6 @@ bool CNXDNSACCH::decode(const unsigned char* data)
 
 	conv.chainback(m_data, 36U);
 
-	// CUtils::dump("NXDN, SACCH decoded", m_data, 4U);
-
 	return CNXDNCRC::checkCRC6(m_data, 26U);
 }
 
@@ -126,15 +119,11 @@ void CNXDNSACCH::encode(unsigned char* data) const
 
 	CNXDNCRC::encodeCRC6(temp1, 26U);
 
-	// CUtils::dump("NXDN, SACCH encoded with CRC", temp1, 4U);
-
 	unsigned char temp2[9U];
 
 	CNXDNConvolution conv;
 	conv.encode(temp1, temp2, 36U);
 
-	// CUtils::dump("NXDN, SACCH convolved", temp2, 9U);
-
 	unsigned char temp3[8U];
 
 	unsigned int n = 0U;
@@ -149,8 +138,6 @@ void CNXDNSACCH::encode(unsigned char* data) const
 		}
 	}
 
-	// CUtils::dump("NXDN, SACCH punctured", temp3, 8U);
-
 	for (unsigned int i = 0U; i < NXDN_SACCH_LENGTH_BITS; i++) {
 		unsigned int n = INTERLEAVE_TABLE[i] + NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS;
 		bool b = READ_BIT1(temp3, i);
diff --git a/NXDNUDCH.cpp b/NXDNUDCH.cpp
index a0d8dbf..c9b3246 100644
--- a/NXDNUDCH.cpp
+++ b/NXDNUDCH.cpp
@@ -21,7 +21,6 @@
 #include "NXDNConvolution.h"
 #include "NXDNDefines.h"
 #include "NXDNCRC.h"
-#include "Utils.h"
 
 #include <cstdio>
 #include <cassert>
@@ -92,8 +91,6 @@ bool CNXDNUDCH::decode(const unsigned char* data)
 {
 	assert(data != NULL);
 
-	// CUtils::dump("NXDN, UDCH/FACCH2 input", data, 44U);
-
 	unsigned char temp1[44U];
 
 	for (unsigned int i = 0U; i < NXDN_FACCH2_LENGTH_BITS; i++) {
@@ -102,8 +99,6 @@ bool CNXDNUDCH::decode(const unsigned char* data)
 		WRITE_BIT1(temp1, i, b);
 	}
 
-	// CUtils::dump("NXDN, UDCH/FACCH2 de-interleaved", temp1, 44U);
-
 	uint8_t temp2[420U];
 
 	unsigned int n = 0U;
@@ -135,8 +130,6 @@ bool CNXDNUDCH::decode(const unsigned char* data)
 
 	conv.chainback(m_data, 203U);
 
-	// CUtils::dump("NXDN, UDCH/FACCH2 decoded", m_data, 25U);
-
 	return CNXDNCRC::checkCRC15(m_data, 184U);
 }
 
@@ -150,15 +143,11 @@ void CNXDNUDCH::encode(unsigned char* data) const
 
 	CNXDNCRC::encodeCRC15(temp1, 184U);
 
-	// CUtils::dump("NXDN, UDCH/FACCH2 encoded with CRC", temp1, 25U);
-
 	unsigned char temp2[51U];
 
 	CNXDNConvolution conv;
 	conv.encode(temp1, temp2, 203U);
 
-	// CUtils::dump("NXDN, UDCH/FACCH2 convolved", temp2, 51U);
-
 	unsigned char temp3[44U];
 
 	unsigned int n = 0U;
@@ -173,8 +162,6 @@ void CNXDNUDCH::encode(unsigned char* data) const
 		}
 	}
 
-	// CUtils::dump("NXDN, UDCH/FACCH2 punctured", temp3, 44U);
-
 	for (unsigned int i = 0U; i < NXDN_FACCH2_LENGTH_BITS; i++) {
 		unsigned int n = INTERLEAVE_TABLE[i] + NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS;
 		bool b = READ_BIT1(temp3, i);
@@ -196,8 +183,7 @@ void CNXDNUDCH::getData(unsigned char* data) const
 
 void CNXDNUDCH::setRAN(unsigned char ran)
 {
-	m_data[0U] &= 0xC0U;
-	m_data[0U] |= ran;
+	m_data[0U] = ran;
 }
 
 void CNXDNUDCH::setData(const unsigned char* data)