diff --git a/.gitmodules b/.gitmodules
index ce3c59e85..aaf744040 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,10 @@
 	branch = ufs_public_release
 [submodule "ccpp/framework"]
 	path = ccpp/framework
-	url = https://github.com/NCAR/ccpp-framework
-	branch = release/public-v4
+	#url = https://github.com/NCAR/ccpp-framework
+	#branch = release/public-v4
+	url = https://github.com/climbfuji/ccpp-framework
+	branch = remove_libxml2
 [submodule "ccpp/physics"]
 	path = ccpp/physics
 	url = https://github.com/NCAR/ccpp-physics
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
index 68bdef4da..3a896c387 160000
--- a/atmos_cubed_sphere
+++ b/atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit 68bdef4da171b5beaeb2ed40bd82785e6d457e43
+Subproject commit 3a896c387e6de5815ee8673d6fbcd2476384b468
diff --git a/ccpp/build_ccpp.sh b/ccpp/build_ccpp.sh
index f6bec6ff9..fe1db2adb 100755
--- a/ccpp/build_ccpp.sh
+++ b/ccpp/build_ccpp.sh
@@ -159,11 +159,6 @@ elif [[ "${MACHINE_ID}" == "linux.gnu" ]]; then
   # netCDF (needed when linking ESMF)
   CCPP_CMAKE_FLAGS="${CCPP_CMAKE_FLAGS} -DNETCDF_DIR=${NETCDF}"
 elif [[ "${MACHINE_ID}" == "gaea.intel" || "${MACHINE_ID}" == "wcoss_cray" ]]; then
-  # Fix broken libxml2 installation on gaea by
-  # using own version (not known to the system)
-  if [[ "${MACHINE_ID}" == "gaea.intel" ]]; then
-    CCPP_CMAKE_FLAGS="${CCPP_CMAKE_FLAGS} -DLIBXML2_LIB_DIR=${LIBXML2_LIB_DIR} -DLIBXML2_INCLUDE_DIR=${LIBXML2_INCLUDE_DIR}"
-  fi
   # DH* At this time, it is not possible to use the dynamic CCPP
   # build on gaea/wcoss_cray. While compiling/linking works, the model
   # crashes immediately. This may be related to 64bit/32bit mismatches
@@ -205,18 +200,16 @@ make ${CCPP_MAKE_FLAGS} install
 
 # Generate ESMF makefile fragment
 
-# Explicitly append libxml2, with or without path
-CCPP_XML2_LIB="${LIBXML2_LIB_DIR:+-L${LIBXML2_LIB_DIR} }-lxml2"
 set -u
 if ( echo "${MAKE_OPT}" | grep STATIC=Y ) ; then
   # Set linker flags for static build
-  CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp -lccppphys ${CCPP_XML2_LIB}"
+  CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp -lccppphys"
 else
   # Set link objects
   if ( echo "$MACHINE_ID" | grep gaea ) ; then
-    CCPP_LINK_OBJS="-dynamic -L${PATH_CCPP_LIB} -lccpp ${CCPP_XML2_LIB} ${CRAY_PMI_POST_LINK_OPTS} -lpmi"
+    CCPP_LINK_OBJS="-dynamic -L${PATH_CCPP_LIB} -lccpp ${CRAY_PMI_POST_LINK_OPTS} -lpmi"
   else
-    CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp ${CCPP_XML2_LIB}"
+    CCPP_LINK_OBJS="-L${PATH_CCPP_LIB} -lccpp"
   fi
 fi
 echo "ESMF_DEP_INCPATH=${PATH_CCPP_INC}" > ${CCPP_MK}
diff --git a/ccpp/framework b/ccpp/framework
index 826b1b935..a6e4dc6ea 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 826b1b9356a6f64e199204cf76badb1ef27de54e
+Subproject commit a6e4dc6ea3d9f4ca436a9d079bdea2dcb24f4617