diff --git a/Config.h b/Config.h
index 4691432..9fe0fdc 100644
--- a/Config.h
+++ b/Config.h
@@ -67,7 +67,7 @@
 // #define SERIAL_REPEATER
 
 // To reduce CPU load, you can remove the DC blocker by commenting out the next line
-#define USE_DCBLOCKER
+// #define USE_DCBLOCKER
 
 // Constant Service LED once repeater is running 
 // Do not use if employing an external hardware watchdog 
diff --git a/IO.cpp b/IO.cpp
index 0e71dd6..90fe534 100644
--- a/IO.cpp
+++ b/IO.cpp
@@ -460,18 +460,10 @@ void CIO::process()
       }
     } else if (m_modemState == STATE_DSTARCAL) {
       q15_t GMSKVals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-	#if !defined (DSTARBOXCAR)
-        ::arm_fir_fast_q15(&m_gaussianFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
-    #else
-        ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
-	#endif
-#else
-	#if !defined (DSTARBOXCAR)
+#if !defined (DSTARBOXCAR)
     	::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
-	#else
+#else
     	::arm_fir_fast_q15(&m_boxcarFilter, samples, GMSKVals, RX_BLOCK_SIZE);
-	#endif
 #endif
       calDStarRX.samples(GMSKVals, RX_BLOCK_SIZE);
     } else if (m_modemState == STATE_RSSICAL) {
diff --git a/MMDVM_STM32F4xx.coproj b/MMDVM_STM32F4xx.coproj
index 2eaffbd..d3d976c 100644
--- a/MMDVM_STM32F4xx.coproj
+++ b/MMDVM_STM32F4xx.coproj
@@ -275,8 +275,8 @@
     <File name="DMRDMORX.h" path="DMRDMORX.h" type="1"/>
     <File name="SerialPort.h" path="SerialPort.h" type="1"/>
     <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" type="1"/>
-    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.h" path="STM32F4XX_Lib/Device/system_stm32f4xx.h" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.h" path="STM32F4XX_Lib/Device/system_stm32f4xx.h" type="1"/>
     <File name="CWIdTX.h" path="CWIdTX.h" type="1"/>
     <File name="CalDStarTX.cpp" path="CalDStarTX.cpp" type="1"/>
     <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source" path="" type="2"/>
@@ -284,15 +284,15 @@
     <File name="IODue.cpp" path="IODue.cpp" type="1"/>
     <File name="CalDMR.h" path="CalDMR.h" type="1"/>
     <File name="DMRTX.cpp" path="DMRTX.cpp" type="1"/>
-    <File name="CalRSSI.h" path="CalRSSI.h" type="1"/>
     <File name="P25RX.cpp" path="P25RX.cpp" type="1"/>
+    <File name="CalRSSI.h" path="CalRSSI.h" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Lib/GCC" path="" type="2"/>
     <File name="STM32F4XX_Lib" path="" type="2"/>
     <File name="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" type="1"/>
     <File name="DMRTX.h" path="DMRTX.h" type="1"/>
     <File name="STM32F4XX_Lib/Device/system_stm32f4xx.c" path="STM32F4XX_Lib/Device/system_stm32f4xx.c" type="1"/>
-    <File name="RSSIRB.h" path="RSSIRB.h" type="1"/>
     <File name="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" path="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" type="1"/>
+    <File name="RSSIRB.h" path="RSSIRB.h" type="1"/>
     <File name="STM32F4XX_Lib/Device/startup" path="" type="2"/>
     <File name="SerialRB.h" path="SerialRB.h" type="1"/>
     <File name="NXDNDefines.h" path="NXDNDefines.h" type="1"/>
@@ -340,8 +340,8 @@
     <File name="P25TX.h" path="P25TX.h" type="1"/>
     <File name="RSSIRB.cpp" path="RSSIRB.cpp" type="1"/>
     <File name="DStarRX.cpp" path="DStarRX.cpp" type="1"/>
-    <File name="IOSTM.cpp" path="IOSTM.cpp" type="1"/>
     <File name="DMRSlotRX.cpp" path="DMRSlotRX.cpp" type="1"/>
+    <File name="IOSTM.cpp" path="IOSTM.cpp" type="1"/>
     <File name="P25TX.cpp" path="P25TX.cpp" type="1"/>
     <File name="SerialRB.cpp" path="SerialRB.cpp" type="1"/>
     <File name="CWIdTX.cpp" path="CWIdTX.cpp" type="1"/>
diff --git a/SerialPort.cpp b/SerialPort.cpp
index a47cd4b..6f2a31d 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -88,7 +88,7 @@ const uint8_t MMDVM_DEBUG5       = 0xF5U;
 #define TCXO "NO TCXO"
 #endif
 
-#define DESCRIPTION              "MMDVM 20180615 48Khz(D-Star/DMR/System Fusion/P25/NXDN)"
+#define DESCRIPTION              "MMDVM 20180630 (D-Star/DMR/System Fusion/P25/NXDN)"
 
 #if defined(GITVERSION)
 #define concat(a, b, c) a " " b " GitID #" c ""
diff --git a/YSFTX.cpp b/YSFTX.cpp
index bfd5462..e358c99 100644
--- a/YSFTX.cpp
+++ b/YSFTX.cpp
@@ -69,7 +69,6 @@ m_txCount(0U)
   m_modFilter.pState      = m_modState;
 }
 
-
 void CYSFTX::process()
 {
   if (m_buffer.getData() == 0U && m_poLen == 0U && m_txCount == 0U)
@@ -93,7 +92,7 @@ void CYSFTX::process()
   if (m_poLen > 0U) {
     // Transmit YSF data.
     uint16_t space = io.getSpace();
-
+    
     while (space > (4U * YSF_RADIO_SYMBOL_LENGTH)) {
       uint8_t c = m_poBuffer[m_poPtr++];
       writeByte(c);