diff --git a/.gitmodules b/.gitmodules
index e757b8796d..2c20fd9e8e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -200,29 +200,8 @@ fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
 
 [submodule "ww3"]
-path = components/ww3
-url = https://github.com/NorESMhub/WW3_interface
+	path = components/ww3
+	url = https://github.com/NorESMhub/WW3_interface
 fxtag = ww3_interface_noresm0.0.15
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/NorESMhub/WW3_interface
-
-[submodule "rtm"]
-path = components/rtm
-url = https://github.com/ESCOMP/RTM
-fxtag = rtm1_0_79
-fxrequired = ToplevelRequired
-fxDONOTUSEurl = https://github.com/ESCOMP/RTM
-
-[submodule "mizuRoute"]
-path = components/mizuRoute
-url = https://github.com/ESCOMP/mizuRoute
-fxtag = cesm-coupling.n02_v2.1.2
-fxrequired = ToplevelRequired
-fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
-
-[submodule "fms"]
-path = libraries/FMS
-url = https://github.com/ESCOMP/FMS_interface
-fxtag = fi_240516
-fxrequired = ToplevelRequired
-fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
diff --git a/ccs_config b/ccs_config
index 2ff978f92a..afec30fbd9 160000
--- a/ccs_config
+++ b/ccs_config
@@ -1 +1 @@
-Subproject commit 2ff978f92a5ac9a6ab243e5c14d06a7e2d2f5799
+Subproject commit afec30fbd91e1689c53fdb53f318437e1c3ed2b6
diff --git a/cime b/cime
index 422ddaa770..f4a63723ea 160000
--- a/cime
+++ b/cime
@@ -1 +1 @@
-Subproject commit 422ddaa770a3cea6e83a60c9700ebce77acaceed
+Subproject commit f4a63723ead19bf5391abf21e5d49bd3741f7e39
diff --git a/components/cdeps b/components/cdeps
index 7476950699..8b7314b95b 160000
--- a/components/cdeps
+++ b/components/cdeps
@@ -1 +1 @@
-Subproject commit 7476950699909813d1938a34bd8d71bf5bfbf1e9
+Subproject commit 8b7314b95b9135ddaab31dc28e28baf52ea13841
diff --git a/components/cice b/components/cice
index bdf6ea04d6..bfc0a0892b 160000
--- a/components/cice
+++ b/components/cice
@@ -1 +1 @@
-Subproject commit bdf6ea04d6133434fcaa4de5336de106f01290d0
+Subproject commit bfc0a0892bada6219d6283ae96eed3ce48c82744
diff --git a/components/clm b/components/clm
index a9433779f0..5e99159e6f 160000
--- a/components/clm
+++ b/components/clm
@@ -1 +1 @@
-Subproject commit a9433779f0ae499d60ad118d2ec331628f0eaaa8
+Subproject commit 5e99159e6fcb49b3ebeddf60c33cb7698870b0d3
diff --git a/components/cmeps b/components/cmeps
index 6384ff4e4a..1d456df89c 160000
--- a/components/cmeps
+++ b/components/cmeps
@@ -1 +1 @@
-Subproject commit 6384ff4e4a6bc82a678f9419a43ffbd5d53ac209
+Subproject commit 1d456df89ce4a1aefe7cf9f5564c53ebe3dab41f
diff --git a/components/mizuRoute b/components/mizuRoute
deleted file mode 160000
index 81c720c7ee..0000000000
--- a/components/mizuRoute
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81c720c7ee51f9c69f2934f696078c42f4493565
diff --git a/components/mosart b/components/mosart
index 8c682b1b7f..e2ffe00004 160000
--- a/components/mosart
+++ b/components/mosart
@@ -1 +1 @@
-Subproject commit 8c682b1b7f15d146816de302e0d359da3e957056
+Subproject commit e2ffe00004cc416cfc8bcfae2a949474075c1d1f
diff --git a/components/rtm b/components/rtm
deleted file mode 160000
index 88503adbc2..0000000000
--- a/components/rtm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 88503adbc275fb2ccbb6b598e460deaeb140e515
diff --git a/components/ww3 b/components/ww3
new file mode 160000
index 0000000000..4e0ac3d700
--- /dev/null
+++ b/components/ww3
@@ -0,0 +1 @@
+Subproject commit 4e0ac3d700a151e46a9219ed8773928881e3ba2b
diff --git a/share b/share
index 4b9dc4871a..b26285a01b 160000
--- a/share
+++ b/share
@@ -1 +1 @@
-Subproject commit 4b9dc4871a259f00f35bb47708d876cb7dcdf75c
+Subproject commit b26285a01ba00c2c7f31182708827096b1bf93a8
diff --git a/src/chemistry/oslo_aero b/src/chemistry/oslo_aero
new file mode 160000
index 0000000000..2414f8597f
--- /dev/null
+++ b/src/chemistry/oslo_aero
@@ -0,0 +1 @@
+Subproject commit 2414f8597ff5db1f093a1f42ab39394879b4fa44
diff --git a/src/physics/camnor_phys b/src/physics/camnor_phys
new file mode 160000
index 0000000000..1f23c7cc48
--- /dev/null
+++ b/src/physics/camnor_phys
@@ -0,0 +1 @@
+Subproject commit 1f23c7cc48caf27e27a732ac5f805d4bdb673fe0