diff --git a/library/util_rfifo/util_rfifo_ip.tcl b/library/util_rfifo/util_rfifo_ip.tcl
index 246180fac..7e75fb3f5 100644
--- a/library/util_rfifo/util_rfifo_ip.tcl
+++ b/library/util_rfifo/util_rfifo_ip.tcl
@@ -9,15 +9,7 @@ adi_ip_files util_rfifo [list \
 
 adi_ip_properties_lite util_rfifo
 
-ipx::remove_bus_interface {s} [ipx::current_core]
-ipx::remove_bus_interface {m} [ipx::current_core]
-ipx::remove_bus_interface {fifo} [ipx::current_core]
-ipx::remove_bus_interface {signal_clock} [ipx::current_core]
-
-ipx::remove_memory_map {m} [ipx::current_core]
-ipx::remove_address_space {s} [ipx::current_core]
-ipx::remove_address_space {fifo} [ipx::current_core]
-
+ipx::remove_all_bus_interface [ipx::current_core]
 ipx::save_core [ipx::current_core]