diff --git a/docs/test-results/decode_long_hackrf.md b/docs/test-results/decode_long_hackrf.md
index 7dc285d..d2e6b97 100644
--- a/docs/test-results/decode_long_hackrf.md
+++ b/docs/test-results/decode_long_hackrf.md
@@ -1,6 +1,6 @@
 # Test suite: 'decode_long_hackrf'
 
-*Results on 2017-09-14 14:36:37.348840*
+*Results on 2017-09-15 11:28:32.183183*
 
 ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off
 
diff --git a/docs/test-results/decode_long_rtl-sdr.md b/docs/test-results/decode_long_rtl-sdr.md
index 23b9cae..afce559 100644
--- a/docs/test-results/decode_long_rtl-sdr.md
+++ b/docs/test-results/decode_long_rtl-sdr.md
@@ -1,6 +1,6 @@
 # Test suite: 'decode_long_rtl-sdr'
 
-*Results on 2017-09-14 14:35:21.382711*
+*Results on 2017-09-15 11:27:16.260766*
 
 ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off
 
diff --git a/docs/test-results/decode_long_usrp.md b/docs/test-results/decode_long_usrp.md
index 5d4d05a..164c773 100644
--- a/docs/test-results/decode_long_usrp.md
+++ b/docs/test-results/decode_long_usrp.md
@@ -1,6 +1,6 @@
 # Test suite: 'decode_long_usrp'
 
-*Results on 2017-09-14 14:35:57.973367*
+*Results on 2017-09-15 11:27:52.849819*
 
 ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off
 
diff --git a/docs/test-results/short_hackrf.md b/docs/test-results/short_hackrf.md
index e0c0bcd..dc1e35e 100644
--- a/docs/test-results/short_hackrf.md
+++ b/docs/test-results/short_hackrf.md
@@ -1,6 +1,6 @@
 # Test suite: 'short_hackrf'
 
-*Results on 2017-09-14 14:45:53.995797*
+*Results on 2017-09-15 11:37:48.801373*
 
 ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off
 
diff --git a/docs/test-results/short_rtl-sdr.md b/docs/test-results/short_rtl-sdr.md
index 2705473..cd6be43 100644
--- a/docs/test-results/short_rtl-sdr.md
+++ b/docs/test-results/short_rtl-sdr.md
@@ -1,6 +1,6 @@
 # Test suite: 'short_rtl-sdr'
 
-*Results on 2017-09-14 14:37:14.668511*
+*Results on 2017-09-15 11:29:09.534517*
 
 ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off
 
diff --git a/docs/test-results/short_usrp.md b/docs/test-results/short_usrp.md
index 79b36af..4d4e893 100644
--- a/docs/test-results/short_usrp.md
+++ b/docs/test-results/short_usrp.md
@@ -1,6 +1,6 @@
 # Test suite: 'short_usrp'
 
-*Results on 2017-09-14 14:41:17.943080*
+*Results on 2017-09-15 11:33:12.759248*
 
 ### 868.1 MHz, SF 7, CR 4/8, BW 125 kHz, prlen 8, crc on, implicit off
 
diff --git a/lib/decoder_impl.cc b/lib/decoder_impl.cc
index bad5797..45798f3 100644
--- a/lib/decoder_impl.cc
+++ b/lib/decoder_impl.cc
@@ -326,9 +326,6 @@ namespace gr {
 
             autocorr = abs(dot_product / gr_complex(sqrt(energy_chirp1 * energy_chirp2), 0));
 
-            if(energy_chirp1 < 0.05f)
-                autocorr = 0; // TODO: fixme
-
             return autocorr;
         }
 
@@ -699,9 +696,6 @@ namespace gr {
 
             d_fine_sync = 0; // Always reset fine sync
 
-            // DBGR_TIME_MEASUREMENT_TO_FILE("SF7_fft_idx");
-            // DBGR_START_TIME_MEASUREMENT(false, gr::lora::DecoderStateToString(d_state));
-
             switch (d_state) {
                 case gr::lora::DecoderState::DETECT: {
                     float correlation = detect_preamble_autocorr(input, d_samples_per_symbol);