diff --git a/grc/hamnet70_demod_sc16qam.grc b/grc/hamnet70_demod_sc16qam.grc
index 806ac89..8f47867 100644
--- a/grc/hamnet70_demod_sc16qam.grc
+++ b/grc/hamnet70_demod_sc16qam.grc
@@ -795,7 +795,7 @@ blocks:
     bus_structure: null
     coordinate: [2465, 921]
     rotation: 0
-    state: bypassed
+    state: enabled
 - name: digital_header_payload_demux_0
   id: digital_header_payload_demux
   parameters:
@@ -918,25 +918,6 @@ blocks:
     coordinate: [2649, 913]
     rotation: 0
     state: enabled
-- name: hamnet70_correct_frequency_from_pilot_syms_0
-  id: hamnet70_correct_frequency_from_pilot_syms
-  parameters:
-    affinity: ''
-    alias: ''
-    comment: ''
-    maxoutbuf: '0'
-    minoutbuf: '0'
-    offsets: '[len(preamble)+pilot_offset]'
-    phase_ref_offset: len(preamble)//2
-    pilot_sequence: pilot_sequence
-    start_tag: corr_est
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [1254, 387]
-    rotation: 0
-    state: bypassed
 - name: hamnet70_correct_phase_from_tag_0
   id: hamnet70_correct_phase_from_tag
   parameters:
@@ -1246,9 +1227,7 @@ connections:
 - [fec_async_decoder_0, out, digital_crc32_async_bb_0, in]
 - [fec_extended_tagged_decoder_0, '0', blocks_repack_bits_bb_0_0, '0']
 - [hamnet70_async_scrambler_0, pdu_out, pad_sink_2, in]
-- [hamnet70_correct_frequency_from_pilot_syms_0, '0', analog_agc2_xx_0, '0']
-- [hamnet70_correct_phase_from_tag_0, '0', hamnet70_correct_frequency_from_pilot_syms_0,
-  '0']
+- [hamnet70_correct_phase_from_tag_0, '0', analog_agc2_xx_0, '0']
 - [hamnet70_freq_est_lr_0, '0', hamnet70_pid_controller_0, '0']
 - [hamnet70_freq_est_lr_0, '0', pad_sink_4, '0']
 - [hamnet70_insert_delayed_tag_0, '0', hamnet70_qam_phase_tracker_0, '0']
diff --git a/grc/hamnet70_mod_sc16qam.grc b/grc/hamnet70_mod_sc16qam.grc
index b75d6f5..a1aa81f 100644
--- a/grc/hamnet70_mod_sc16qam.grc
+++ b/grc/hamnet70_mod_sc16qam.grc
@@ -340,7 +340,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1496, 504.0]
+    coordinate: [1520, 504.0]
     rotation: 0
     state: enabled
 - name: digital_chunks_to_symbols_xx_0_0
@@ -380,7 +380,7 @@ blocks:
     bus_structure: null
     coordinate: [351, 394]
     rotation: 0
-    state: bypassed
+    state: enabled
 - name: digital_map_bb_0
   id: digital_map_bb
   parameters:
@@ -467,24 +467,6 @@ blocks:
     coordinate: [167, 386]
     rotation: 0
     state: enabled
-- name: hamnet70_insert_pilot_symbols_0
-  id: hamnet70_insert_pilot_symbols
-  parameters:
-    affinity: ''
-    alias: ''
-    comment: ''
-    length_tag: packet_len
-    maxoutbuf: '0'
-    minoutbuf: '0'
-    offsets: '[len(preamble)+pilot_offset]'
-    pilot_sequence: pilot_sequence
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [2196, 403]
-    rotation: 0
-    state: bypassed
 - name: hamnet70_symbol_interleaver_0
   id: hamnet70_symbol_interleaver
   parameters:
@@ -622,7 +604,7 @@ connections:
 - [blocks_repack_bits_bb_0, '0', digital_map_bb_0, '0']
 - [blocks_repack_bits_bb_0, '0', digital_packet_headergenerator_bb_0, '0']
 - [blocks_repack_bits_bb_0_0, '0', digital_map_bb_0_0, '0']
-- [blocks_tagged_stream_mux_0, '0', hamnet70_insert_pilot_symbols_0, '0']
+- [blocks_tagged_stream_mux_0, '0', virtual_sink_0, '0']
 - [blocks_vector_source_x_0, '0', blocks_tagged_stream_mux_0, '0']
 - [digital_chunks_to_symbols_xx_0, '0', hamnet70_symbol_interleaver_0, '0']
 - [digital_chunks_to_symbols_xx_0_0, '0', blocks_tagged_stream_mux_0, '1']
@@ -633,7 +615,6 @@ connections:
 - [digital_packet_headergenerator_bb_0, '0', blocks_repack_bits_bb_0_0, '0']
 - [fec_async_encoder_0, out, blocks_pdu_to_tagged_stream_0, pdus]
 - [hamnet70_async_scrambler_0, pdu_out, digital_crc32_async_bb_0, in]
-- [hamnet70_insert_pilot_symbols_0, '0', virtual_sink_0, '0']
 - [hamnet70_symbol_interleaver_0, '0', blocks_tagged_stream_mux_0, '2']
 - [interp_fir_filter_xxx_0, '0', pad_sink_0, '0']
 - [pad_source_0, out, hamnet70_async_scrambler_0, pdu_in]
diff --git a/tmp/test_sc16qam.grc b/tmp/test_sc16qam.grc
index caf2946..12d0fa1 100644
--- a/tmp/test_sc16qam.grc
+++ b/tmp/test_sc16qam.grc
@@ -74,6 +74,18 @@ blocks:
     coordinate: [854, 51]
     rotation: 0
     state: enabled
+- name: plen
+  id: variable
+  parameters:
+    comment: ''
+    value: '979'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [352, 12.0]
+    rotation: 0
+    state: enabled
 - name: samp_rate
   id: variable
   parameters:
@@ -182,9 +194,9 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     repeat: 'True'
-    tags: tagged_streams.make_lengthtags((104,), (0,), "packet_len")
+    tags: tagged_streams.make_lengthtags((plen,), (0,), "packet_len")
     type: byte
-    vector: bytes([x%256 for x in range(104)])
+    vector: bytes([x%256 for x in range(plen)])
     vlen: '1'
   states:
     bus_sink: false