diff --git a/library/axi_mc_controller/axi_mc_controller.v b/library/axi_mc_controller/axi_mc_controller.v
index 8295df788..e29a5f5e8 100755
--- a/library/axi_mc_controller/axi_mc_controller.v
+++ b/library/axi_mc_controller/axi_mc_controller.v
@@ -310,13 +310,11 @@ up_adc_channel #(.PCORE_ADC_CHID(0)) adc_channel_ref_speed(
     .adc_clk(ref_clk),
     .adc_rst(adc_rst),
     .adc_enable(enable_ref_speed_s),
-    .adc_pn_sel(),
     .adc_iqcor_enb(),
     .adc_dcfilt_enb(),
     .adc_dfmt_se(),
     .adc_dfmt_type(),
     .adc_dfmt_enable(),
-    .adc_pn_type(),
     .adc_dcfilt_offset(),
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
@@ -354,13 +352,11 @@ up_adc_channel #(.PCORE_ADC_CHID(1)) adc_channel_actual_speed(
     .adc_clk(ref_clk),
     .adc_rst(adc_rst),
     .adc_enable(enable_actual_speed_s),
-    .adc_pn_sel(),
     .adc_iqcor_enb(),
     .adc_dcfilt_enb(),
     .adc_dfmt_se(),
     .adc_dfmt_type(),
     .adc_dfmt_enable(),
-    .adc_pn_type(),
     .adc_dcfilt_offset(),
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
@@ -404,9 +400,6 @@ up_adc_common i_up_adc_common(
     .adc_ddr_edgesel(),
     .adc_pin_mode(),
     .adc_status(1'b1),
-    .adc_status_pn_err(),
-    .adc_status_pn_oos(),
-    .adc_status_or(),
     .adc_status_ovf(adc_dovf_i),
     .adc_status_unf(adc_dunf_i),
     .adc_clk_ratio(32'd1),
diff --git a/library/axi_mc_current_monitor/axi_mc_current_monitor.v b/library/axi_mc_current_monitor/axi_mc_current_monitor.v
index 01a6de898..5e57bfc4f 100755
--- a/library/axi_mc_current_monitor/axi_mc_current_monitor.v
+++ b/library/axi_mc_current_monitor/axi_mc_current_monitor.v
@@ -540,13 +540,11 @@ up_adc_channel #(.PCORE_ADC_CHID(0)) i_up_adc_channel_ia(
     .adc_clk(adc_clk_s),
     .adc_rst(adc_rst),
     .adc_enable(adc_enable_ia),
-    .adc_pn_sel(),
     .adc_iqcor_enb(),
     .adc_dcfilt_enb(),
     .adc_dfmt_se(),
     .adc_dfmt_type(),
     .adc_dfmt_enable(),
-    .adc_pn_type(),
     .adc_dcfilt_offset(),
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
@@ -583,14 +581,12 @@ up_adc_channel #(.PCORE_ADC_CHID(0)) i_up_adc_channel_ia(
 up_adc_channel #(.PCORE_ADC_CHID(1)) i_up_adc_channel_ib(
     .adc_clk(adc_clk_s),
     .adc_rst(adc_rst),
-    .adc_enable(adc_enable_ib), 
-    .adc_pn_sel(),
+    .adc_enable(adc_enable_ib),
     .adc_iqcor_enb(),
     .adc_dcfilt_enb(),
     .adc_dfmt_se(),
     .adc_dfmt_type(),
     .adc_dfmt_enable(),
-    .adc_pn_type(),
     .adc_dcfilt_offset(),
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
@@ -628,13 +624,11 @@ up_adc_channel #(.PCORE_ADC_CHID(2)) i_up_adc_channel_it(
     .adc_clk(adc_clk_s),
     .adc_rst(adc_rst),
     .adc_enable(adc_enable_it),
-    .adc_pn_sel(),
     .adc_iqcor_enb(),
     .adc_dcfilt_enb(),
     .adc_dfmt_se(),
     .adc_dfmt_type(),
     .adc_dfmt_enable(),
-    .adc_pn_type(),
     .adc_dcfilt_offset(),
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
@@ -672,13 +666,11 @@ up_adc_channel #(.PCORE_ADC_CHID(3)) i_up_adc_channel_vbus(
     .adc_clk(adc_clk_s),
     .adc_rst(adc_rst),
     .adc_enable(adc_enable_vbus),
-    .adc_pn_sel(),
     .adc_iqcor_enb(),
     .adc_dcfilt_enb(),
     .adc_dfmt_se(),
     .adc_dfmt_type(),
     .adc_dfmt_enable(),
-    .adc_pn_type(),
     .adc_dcfilt_offset(),
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
@@ -723,9 +715,6 @@ up_adc_common i_up_adc_common(
     .adc_ddr_edgesel(),
     .adc_pin_mode(),
     .adc_status(1'b1),
-    .adc_status_pn_err(),
-    .adc_status_pn_oos(),
-    .adc_status_or(),
     .adc_status_ovf(adc_dovf_i),
     .adc_status_unf(adc_dunf_i),
     .adc_clk_ratio(32'd1),
diff --git a/library/axi_mc_current_monitor/axi_mc_current_monitor_ip.tcl b/library/axi_mc_current_monitor/axi_mc_current_monitor_ip.tcl
index 83e0d58e1..04af9108b 100755
--- a/library/axi_mc_current_monitor/axi_mc_current_monitor_ip.tcl
+++ b/library/axi_mc_current_monitor/axi_mc_current_monitor_ip.tcl
@@ -12,8 +12,6 @@ adi_ip_files axi_mc_current_monitor [list \
   "$ad_hdl_dir/library/common/up_xfer_cntrl.v" \
   "$ad_hdl_dir/library/common/up_xfer_status.v" \
   "$ad_hdl_dir/library/common/up_clock_mon.v" \
-  "$ad_hdl_dir/library/common/up_drp_cntrl.v" \
-  "$ad_hdl_dir/library/common/up_delay_cntrl.v" \
   "$ad_hdl_dir/library/common/up_adc_common.v" \
   "$ad_hdl_dir/library/common/up_adc_channel.v" \
   "dec256sinc24b.v" \
diff --git a/library/axi_mc_speed/axi_mc_speed.v b/library/axi_mc_speed/axi_mc_speed.v
index 332d591dc..62ccf5b1a 100755
--- a/library/axi_mc_speed/axi_mc_speed.v
+++ b/library/axi_mc_speed/axi_mc_speed.v
@@ -254,9 +254,6 @@ up_adc_common i_up_adc_common(
   .adc_ddr_edgesel(),
   .adc_pin_mode(),
   .adc_status(1'b1),
-  .adc_status_pn_err(1'b0),
-  .adc_status_pn_oos(1'b0),
-  .adc_status_or(),
   .adc_status_ovf(adc_dovf_i),
   .adc_status_unf(adc_dunf_i),
   .adc_clk_ratio(32'd1),
diff --git a/library/axi_mc_speed/axi_mc_speed_ip.tcl b/library/axi_mc_speed/axi_mc_speed_ip.tcl
index 5c36a2dec..6c80768bd 100755
--- a/library/axi_mc_speed/axi_mc_speed_ip.tcl
+++ b/library/axi_mc_speed/axi_mc_speed_ip.tcl
@@ -10,8 +10,10 @@ adi_ip_files axi_mc_speed [list \
   "$ad_hdl_dir/library/common/up_delay_cntrl.v" \
   "$ad_hdl_dir/library/common/up_clock_mon.v" \
   "$ad_hdl_dir/library/common/up_drp_cntrl.v" \
-  "$ad_hdl_dir/library/common/up_delay_cntrl.v" \
+  "$ad_hdl_dir/library/common/up_xfer_cntrl.v" \
+  "$ad_hdl_dir/library/common/up_xfer_status.v" \
   "$ad_hdl_dir/library/common/up_adc_common.v" \
+  "$ad_hdl_dir/library/common/up_adc_channel.v" \
   "debouncer.v" \
   "speed_detector.v" \
   "delay_30_degrees.v" \