13 files changed, 1 insertions, 977 deletions
diff --git a/gr-digital/grc/CMakeLists.txt b/gr-digital/grc/CMakeLists.txt
index 9888247ca2..a3d0223290 100644
--- a/gr-digital/grc/CMakeLists.txt
+++ b/gr-digital/grc/CMakeLists.txt
@@ -19,5 +19,5 @@
 
 file(GLOB xml_files "*.xml")
 install(FILES ${xml_files}
-    DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "digital_python"
+    DESTINATION ${GRC_BLOCKS_DIR}
 )
diff --git a/gr-digital/grc/blks2_packet_decoder.xml b/gr-digital/grc/blks2_packet_decoder.xml
deleted file mode 100644
index fedb2e74f3..0000000000
--- a/gr-digital/grc/blks2_packet_decoder.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Packet Decoder
-###################################################
- -->
-<block>
-	<name>Packet Decoder</name>
-	<key>blks2_packet_decoder</key>
-	<category>[Core]/Deprecated</category>
-	<flags>deprecated</flags>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.packet_demod_$(type.fcn)(grc_blks2.packet_decoder(
-		access_code=$access_code,
-		threshold=$threshold,
-		callback=lambda ok, payload: self.$(id).recv_pkt(ok, payload),
-	),
-)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<value>float</value>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-		</option>
-	</param>
-	<param>
-		<name>Access Code</name>
-		<key>access_code</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Threshold</name>
-		<key>threshold</key>
-		<value>-1</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-	</source>
-	<doc>
-Packet decoder block, for use with the gnuradio demodulator blocks: gmsk, psk, qam.
-
-Access Code: string of 1's and 0's, leave blank for automatic.
-
-Threshold: -1 for automatic.
-	</doc>
-</block>
diff --git a/gr-digital/grc/blks2_packet_encoder.xml b/gr-digital/grc/blks2_packet_encoder.xml
deleted file mode 100644
index d030f6ae22..0000000000
--- a/gr-digital/grc/blks2_packet_encoder.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Packet Encoder
-###################################################
- -->
-<block>
-	<name>Packet Encoder</name>
-	<key>blks2_packet_encoder</key>
-	<category>[Core]/Deprecated</category>
-	<flags>deprecated</flags>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.packet_mod_$(type.fcn)(grc_blks2.packet_encoder(
-		samples_per_symbol=$samples_per_symbol,
-		bits_per_symbol=$bits_per_symbol,
-		preamble=$preamble,
-		access_code=$access_code,
-		pad_for_usrp=$pad_for_usrp,
-	),
-	payload_length=$payload_length,
-)</make>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<value>float</value>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-		</option>
-	</param>
-	<param>
-		<name>Samples/Symbol</name>
-		<key>samples_per_symbol</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Bits/Symbol</name>
-		<key>bits_per_symbol</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Preamble</name>
-		<key>preamble</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Access Code</name>
-		<key>access_code</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Pad for USRP</name>
-		<key>pad_for_usrp</key>
-		<type>enum</type>
-		<option>
-			<name>Yes</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>No</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Payload Length</name>
-		<key>payload_length</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>byte</type>
-	</source>
-	<doc>
-Packet encoder block, for use with the gnuradio modulator blocks: gmsk, dpsk, qam.
-
-Preamble: string of 1's and 0's, leave blank for automatic.
-
-Access Code: string of 1's and 0's, leave blank for automatic.
-
-Payload Length: 0 for automatic.
-
-Bits/Symbol should be set accordingly:
-	gmsk -> 1
-	dbpsk -> 1
-	dqpsk -> 2
-	d8psk -> 3
-	qam8 -> 3
-	qam16 -> 4
-	qam64 -> 6
-	qam256 -> 8
-	</doc>
-</block>
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index f11f27e5c3..88da4b7621 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -116,7 +116,6 @@
     <block>digital_clock_recovery_mm_xx</block>
     <block>digital_costas_loop_cc</block>
     <block>digital_fll_band_edge_cc</block>
-    <block>digital_mpsk_receiver_cc</block>
     <block>digital_pfb_clock_sync_xxx</block>
     <block>digital_pn_correlator_cc</block>
     <block>digital_corr_est_cc</block>
diff --git a/gr-digital/grc/digital_correlate_and_sync_cc.xml b/gr-digital/grc/digital_correlate_and_sync_cc.xml
deleted file mode 100644
index fffdcd23d7..0000000000
--- a/gr-digital/grc/digital_correlate_and_sync_cc.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<block>
-  <name>Correlate and Sync</name>
-  <key>digital_correlate_and_sync_cc</key>
-  <category>[Core]/Deprecated</category>
-  <import>from gnuradio import digital</import>
-  <make>digital.correlate_and_sync_cc($symbols, $filter, $sps)</make>
-  <param>
-    <name>Symbols</name>
-    <key>symbols</key>
-    <value>[1,1,-1,-1,1,1,-1,-1,1,1,-1,-1,1,-1,1,-1]</value>
-    <type>complex_vector</type>
-  </param>
-  <param>
-    <name>Filter</name>
-    <key>filter</key>
-    <type>complex_vector</type>
-  </param>
-  <param>
-    <name>Samples per Symbol</name>
-    <key>sps</key>
-    <value>4</value>
-    <type>int</type>
-  </param>
-  <sink>
-    <name>in</name>
-    <type>complex</type>
-  </sink>
-  <source>
-    <name>out</name>
-    <type>complex</type>
-  </source>
-  <source>
-    <name>corr</name>
-    <type>complex</type>
-  </source>
-</block>
diff --git a/gr-digital/grc/digital_mpsk_receiver_cc.xml b/gr-digital/grc/digital_mpsk_receiver_cc.xml
deleted file mode 100644
index 76f0ccd5ea..0000000000
--- a/gr-digital/grc/digital_mpsk_receiver_cc.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##MPSK Receiver
-###################################################
- -->
-<block>
-	<name>MPSK Receiver</name>
-	<key>digital_mpsk_receiver_cc</key>
-  	<category>[Core]/Deprecated</category>
-	<import>from gnuradio import digital;import cmath</import>
-	<make>digital.mpsk_receiver_cc($M, $theta, $w, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make>
-	<callback>set_loop_bandwidth($w)</callback>
-	<callback>set_mu($mu)</callback>
-	<callback>set_gain_mu($gain_mu)</callback>
-	<callback>set_omega($omega)</callback>
-	<callback>set_gain_omega($gain_omega)</callback>
-	<param>
-		<name>M</name>
-		<key>M</key>
-		<value>4</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Theta</name>
-		<key>theta</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Loop Bandwidth</name>
-		<key>w</key>
-		<value>cmath.pi/100.0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Min Freq</name>
-		<key>fmin</key>
-		<value>-0.5</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Max Freq</name>
-		<key>fmax</key>
-		<value>0.5</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Mu</name>
-		<key>mu</key>
-		<value>0.25</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gain Mu</name>
-		<key>gain_mu</key>
-		<value>0.01</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Omega</name>
-		<key>omega</key>
-		<value>2</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gain Omega</name>
-		<key>gain_omega</key>
-		<value>0.001</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Omega Relative Limit</name>
-		<key>omega_relative_limit</key>
-		<value>0.001</value>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-
-</block>
diff --git a/gr-digital/grc/digital_ofdm_demod.xml b/gr-digital/grc/digital_ofdm_demod.xml
deleted file mode 100644
index 1a7ce24e18..0000000000
--- a/gr-digital/grc/digital_ofdm_demod.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2011 Free Software Foundation, Inc.
- 
- This file is part of GNU Radio
- 
- GNU Radio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
- 
- GNU Radio is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with GNU Radio; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street,
- Boston, MA 02110-1301, USA.
--->
-
-<!--
-###################################################
-##OFDM Demod
-###################################################
- -->
-<block>
-	<name>OFDM Demod</name>
-	<key>digital_ofdm_demod</key>
-        <category>[Core]/Deprecated</category>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<import>from gnuradio import digital</import>
-	<make>grc_blks2.packet_demod_$(type.fcn)(digital.ofdm_demod(
-		options=grc_blks2.options(
-			modulation="$modulation",
-			fft_length=$fft_length,
-			occupied_tones=$occupied_tones,
-			cp_length=$cp_length,
-			snr=$snr,
-			log=None,
-			verbose=None,
-		),
-		callback=lambda ok, payload: self.$(id).recv_pkt(ok, payload),
-	),
-)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<value>float</value>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-		</option>
-	</param>
-	<param>
-		<name>Modulation</name>
-		<key>modulation</key>
-		<type>enum</type>
-		<option>
-			<name>BPSK</name>
-			<key>bpsk</key>
-		</option>
-		<option>
-			<name>QPSK</name>
-			<key>qpsk</key>
-		</option>
-		<option>
-			<name>8PSK</name>
-			<key>8psk</key>
-		</option>
-		<option>
-			<name>QAM8</name>
-			<key>qam8</key>
-		</option>
-		<option>
-			<name>QAM16</name>
-			<key>qam16</key>
-		</option>
-		<option>
-			<name>QAM64</name>
-			<key>qam64</key>
-		</option>
-		<option>
-			<name>QAM256</name>
-			<key>qam256</key>
-		</option>
-	</param>
-	<param>
-		<name>FFT Length</name>
-		<key>fft_length</key>
-		<value>512</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Occupied Tones</name>
-		<key>occupied_tones</key>
-		<value>200</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Cyclic Prefix Length</name>
-		<key>cp_length</key>
-		<value>128</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>SNR</name>
-		<key>snr</key>
-		<value>10</value>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-	</source>
-	<doc>Payload Length: 0 for automatic.</doc>
-</block>
diff --git a/gr-digital/grc/digital_ofdm_frame_acquisition.xml b/gr-digital/grc/digital_ofdm_frame_acquisition.xml
deleted file mode 100644
index f3fb8d63e4..0000000000
--- a/gr-digital/grc/digital_ofdm_frame_acquisition.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2011 Free Software Foundation, Inc.
- 
- This file is part of GNU Radio
- 
- GNU Radio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
- 
- GNU Radio is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with GNU Radio; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street,
- Boston, MA 02110-1301, USA.
--->
-
-<!--
-###################################################
-##OFDM Frame Acquisition
-###################################################
- -->
-<block>
-	<name>OFDM Frame Acquisition</name>
-	<key>digital_ofdm_frame_acquisition</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import digital</import>
-	<make>digital.ofdm_frame_acquisition($occupied_carriers, $fft_length, $cplen, $known_symbol, $max_fft_shift_len)</make>
-	<param>
-		<name>Occupied Carriers</name>
-		<key>occupied_carriers</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>FFT Length</name>
-		<key>fft_length</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>CP Length</name>
-		<key>cplen</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Preamble</name>
-		<key>known_symbol</key>
-		<type>complex_vector</type>
-	</param>
-	<param>
-		<name>Max FFT Shift</name>
-		<key>max_fft_shift_len</key>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-		<vlen>$fft_length</vlen>
-	</sink>
-	<sink>
-		<name>flag</name>
-		<type>byte</type>
-		<vlen>$fft_length</vlen>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-		<vlen>$occupied_carriers</vlen>
-	</source>
-	<source>
-		<name>flag</name>
-		<type>byte</type>
-	</source>
-</block>
diff --git a/gr-digital/grc/digital_ofdm_frame_sink.xml b/gr-digital/grc/digital_ofdm_frame_sink.xml
deleted file mode 100644
index b7cc47b97f..0000000000
--- a/gr-digital/grc/digital_ofdm_frame_sink.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2012 Free Software Foundation, Inc.
- 
- This file is part of GNU Radio
- 
- GNU Radio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
- 
- GNU Radio is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with GNU Radio; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street,
- Boston, MA 02110-1301, USA.
--->
-
-<!--
-###################################################
-##OFDM Frame Sink
-###################################################
- -->
-<block>
-	<name>OFDM Frame Sink</name>
-	<key>digital_ofdm_frame_sink</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import digital</import>
-	<make>digital.ofdm_frame_sink($syms, $vals, $queue, $occ_tones, $ph_gain, $frq_gain)</make>
-	<param>
-		<name>Symbol Points</name>
-		<key>syms</key>
-		<type>complex_vector</type>
-	</param>
-	<param>
-		<name>Symbol Values</name>
-		<key>vals</key>
-		<type>int_vector</type>
-	</param>
-	<param>
-		<name>Message Queue</name>
-		<key>queue</key>
-		<type>raw</type>
-	</param>
-	<param>
-		<name>Occupied Tones</name>
-		<key>occ_tones</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Phase Gain</name>
-		<key>ph_gain</key>
-		<value>0.25</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Freq. Gain</name>
-		<key>frq_gain</key>
-		<value>0.015625</value>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-		<vlen>$occ_tones</vlen>
-	</sink>
-	<sink>
-		<name>flag</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-		<vlen>$occ_tones</vlen>
-	</source>
-</block>
diff --git a/gr-digital/grc/digital_ofdm_insert_preamble.xml b/gr-digital/grc/digital_ofdm_insert_preamble.xml
deleted file mode 100644
index 593fdbd9b4..0000000000
--- a/gr-digital/grc/digital_ofdm_insert_preamble.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2011 Free Software Foundation, Inc.
- 
- This file is part of GNU Radio
- 
- GNU Radio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
- 
- GNU Radio is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with GNU Radio; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street,
- Boston, MA 02110-1301, USA.
--->
-
-<!--
-###################################################
-##OFDM Insert Preamble
-###################################################
- -->
-<block>
-	<name>OFDM Insert Preamble</name>
-	<key>digital_ofdm_insert_preamble</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import digital</import>
-	<make>digital.ofdm_insert_preamble($fft_length, $preamble)</make>
-	<param>
-		<name>FFT Length</name>
-		<key>fft_length</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Preamble</name>
-		<key>preamble</key>
-		<type>raw</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-		<vlen>$fft_length</vlen>
-	</sink>
-	<sink>
-		<name>flag</name>
-		<type>byte</type>
-        <optional>1</optional>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-		<vlen>$fft_length</vlen>
-	</source>
-	<source>
-		<name>flag</name>
-		<type>byte</type>
-        <optional>1</optional>
-	</source>
-</block>
diff --git a/gr-digital/grc/digital_ofdm_mod.xml b/gr-digital/grc/digital_ofdm_mod.xml
deleted file mode 100644
index 066f52f2a9..0000000000
--- a/gr-digital/grc/digital_ofdm_mod.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2011 Free Software Foundation, Inc.
- 
- This file is part of GNU Radio
- 
- GNU Radio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
- 
- GNU Radio is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with GNU Radio; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street,
- Boston, MA 02110-1301, USA.
--->
-
-<!--
-###################################################
-##OFDM Mod
-###################################################
- -->
-<block>
-	<name>OFDM Mod</name>
-	<key>digital_ofdm_mod</key>
-        <category>[Core]/Deprecated</category>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<import>from gnuradio import digital</import>
-	<make>grc_blks2.packet_mod_$(type.fcn)(digital.ofdm_mod(
-		options=grc_blks2.options(
-			modulation="$modulation",
-			fft_length=$fft_length,
-			occupied_tones=$occupied_tones,
-			cp_length=$cp_length,
-			pad_for_usrp=$pad_for_usrp,
-			log=None,
-			verbose=None,
-		),
-	),
-	payload_length=$payload_length,
-)</make>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<value>float</value>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-		</option>
-	</param>
-	<param>
-		<name>Modulation</name>
-		<key>modulation</key>
-		<type>enum</type>
-		<option>
-			<name>BPSK</name>
-			<key>bpsk</key>
-		</option>
-		<option>
-			<name>QPSK</name>
-			<key>qpsk</key>
-		</option>
-		<option>
-			<name>8PSK</name>
-			<key>8psk</key>
-		</option>
-		<option>
-			<name>QAM8</name>
-			<key>qam8</key>
-		</option>
-		<option>
-			<name>QAM16</name>
-			<key>qam16</key>
-		</option>
-		<option>
-			<name>QAM64</name>
-			<key>qam64</key>
-		</option>
-		<option>
-			<name>QAM256</name>
-			<key>qam256</key>
-		</option>
-	</param>
-	<param>
-		<name>FFT Length</name>
-		<key>fft_length</key>
-		<value>512</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Occupied Tones</name>
-		<key>occupied_tones</key>
-		<value>200</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Cyclic Prefix Length</name>
-		<key>cp_length</key>
-		<value>128</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Pad for USRP</name>
-		<key>pad_for_usrp</key>
-		<type>enum</type>
-		<option>
-			<name>Yes</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>No</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Payload Length</name>
-		<key>payload_length</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-	<doc>Payload Length: 0 for automatic.</doc>
-</block>
diff --git a/gr-digital/grc/digital_ofdm_sampler.xml b/gr-digital/grc/digital_ofdm_sampler.xml
deleted file mode 100644
index 09a070562b..0000000000
--- a/gr-digital/grc/digital_ofdm_sampler.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2011 Free Software Foundation, Inc.
- 
- This file is part of GNU Radio
- 
- GNU Radio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
- 
- GNU Radio is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with GNU Radio; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street,
- Boston, MA 02110-1301, USA.
--->
-
-<!--
-###################################################
-##OFDM Sampler
-###################################################
- -->
-<block>
-	<name>OFDM Sampler</name>
-	<key>digital_ofdm_sampler</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import digital</import>
-	<make>digital.ofdm_sampler($fft_length, $symbol_length, $timeout)</make>
-	<param>
-		<name>FFT Length</name>
-		<key>fft_length</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Symbol Length</name>
-		<key>symbol_length</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Timeout</name>
-		<key>timeout</key>
-		<value>1000</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<sink>
-		<name>flag</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-		<vlen>$fft_length</vlen>
-	</source>
-	<source>
-		<name>flag</name>
-		<type>byte</type>
-		<vlen>$fft_length</vlen>
-	</source>
-</block>
diff --git a/gr-digital/grc/digital_ofdm_sync_pn.xml b/gr-digital/grc/digital_ofdm_sync_pn.xml
deleted file mode 100644
index 819996cd07..0000000000
--- a/gr-digital/grc/digital_ofdm_sync_pn.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2011 Free Software Foundation, Inc.
- 
- This file is part of GNU Radio
- 
- GNU Radio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
- 
- GNU Radio is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with GNU Radio; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street,
- Boston, MA 02110-1301, USA.
--->
-
-<!--
-###################################################
-##OFDM Synchronizer - PN based
-###################################################
- -->
-<block>
-	<name>OFDM Sync PN</name>
-	<key>digital_ofdm_sync_pn</key>
-        <category>[Core]/Deprecated</category>
-	<import>from gnuradio import digital</import>
-	<make>digital.ofdm_sync_pn($fft_length, $cp_length, $logging)</make>
-	<param>
-		<name>FFT Length</name>
-		<key>fft_length</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>CP Length</name>
-		<key>cp_length</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Logging</name>
-		<key>logging</key>
-		<value>False</value>
-		<type>bool</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>fine freq</name>
-		<type>float</type>
-	</source>
-	<source>
-		<name>timing sig</name>
-		<type>byte</type>
-	</source>
-</block>