diff --git a/library/util_wfifo/util_wfifo_ip.tcl b/library/util_wfifo/util_wfifo_ip.tcl
index 05c724160..11944882e 100644
--- a/library/util_wfifo/util_wfifo_ip.tcl
+++ b/library/util_wfifo/util_wfifo_ip.tcl
@@ -10,15 +10,7 @@ adi_ip_files util_wfifo [list \
 
 adi_ip_properties_lite util_wfifo
 
-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]