diff --git a/.gitmodules b/.gitmodules
index 5fe102e171539984e8dd6e64ac85d85a4c3cd42d..e02f3565f8311dcfbdad82153640173cf5a5e8a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,9 +42,6 @@
 [submodule "zipr_unpin_plugin"]
 	path = zipr_unpin_plugin
 	url = git@git.zephyr-software.com:allnp/zipr_unpin_plugin.git
-[submodule "zipr_scfi_plugin"]
-	path = zipr_scfi_plugin
-	url = git@git.zephyr-software.com:allzp/zipr_scfi_plugin.git
 [submodule "zipr_relax_plugin"]
 	path = zipr_relax_plugin
 	url = git@git.zephyr-software.com:allnp/zipr_relax_plugin.git
@@ -60,6 +57,3 @@
 [submodule "irdb-sdk"]
 	path = irdb-sdk
 	url = git@git.zephyr-software.com:allnp/irdb-sdk.git
-[submodule "zipr_xeon_plugin"]
-	path = zipr_xeon_plugin
-	url = git@git.zephyr-software.com:allnp/xeon_plugin
diff --git a/irdb-libs b/irdb-libs
index ac5321037efff1dbcecfa88cc0e4b8d702dfc44d..608b5a7fbd65a0b622b976db1fa0687b74bd85d8 160000
--- a/irdb-libs
+++ b/irdb-libs
@@ -1 +1 @@
-Subproject commit ac5321037efff1dbcecfa88cc0e4b8d702dfc44d
+Subproject commit 608b5a7fbd65a0b622b976db1fa0687b74bd85d8
diff --git a/irdb_transforms b/irdb_transforms
index 42b9ffbd71eb9403bdc462ff96efd845c831a3b9..e2ce31411ac8a046841dbad9b97d141450d15446 160000
--- a/irdb_transforms
+++ b/irdb_transforms
@@ -1 +1 @@
-Subproject commit 42b9ffbd71eb9403bdc462ff96efd845c831a3b9
+Subproject commit e2ce31411ac8a046841dbad9b97d141450d15446
diff --git a/zipr_scfi_plugin b/zipr_scfi_plugin
deleted file mode 160000
index 6d590ba4831d0fe114ee50db11a7437a39fd5864..0000000000000000000000000000000000000000
--- a/zipr_scfi_plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d590ba4831d0fe114ee50db11a7437a39fd5864
diff --git a/zipr_xeon_plugin b/zipr_xeon_plugin
deleted file mode 160000
index 8c159de15a16b023747187c1db12e2eb9dc3ca22..0000000000000000000000000000000000000000
--- a/zipr_xeon_plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8c159de15a16b023747187c1db12e2eb9dc3ca22