diff --git a/config_src/mct_driver/ocn_cap_methods.F90 b/config_src/mct_driver/ocn_cap_methods.F90
index ccee291eb9..587433b4fe 100644
--- a/config_src/mct_driver/ocn_cap_methods.F90
+++ b/config_src/mct_driver/ocn_cap_methods.F90
@@ -1,6 +1,6 @@
 module ocn_cap_methods
 
-  use ESMF
+  use ESMF,                only: ESMF_clock, ESMF_time, ESMF_ClockGet, ESMF_TimeGet
   use MOM_ocean_model,     only: ocean_public_type, ocean_state_type
   use MOM_surface_forcing, only: ice_ocean_boundary_type
   use MOM_grid,            only: ocean_grid_type
diff --git a/config_src/nuopc_driver/mom_cap.F90 b/config_src/nuopc_driver/mom_cap.F90
index fdaa4ccd11..51f90aef35 100644
--- a/config_src/nuopc_driver/mom_cap.F90
+++ b/config_src/nuopc_driver/mom_cap.F90
@@ -414,9 +414,9 @@ module mom_cap_mod
   use shr_file_mod,             only: shr_file_setLogUnit, shr_file_setLogLevel
 #endif
 
-  use ESMF
-  use NUOPC
-  use NUOPC_Model, &
+  use ESMF                      ! TODO: only: ...
+  use NUOPC                     ! TODO: only: ...
+  use NUOPC_Model, &            ! TODO: only: ...
     model_routine_SS           => SetServices, &
     model_label_DataInitialize => label_DataInitialize, &
     model_label_Advance        => label_Advance, &
@@ -425,7 +425,7 @@ module mom_cap_mod
 #endif
     model_label_Finalize       => label_Finalize
 
-  use time_utils_mod
+  use time_utils_mod,           only: esmf2fms_time
 
   implicit none
   private
diff --git a/config_src/nuopc_driver/mom_cap_methods.F90 b/config_src/nuopc_driver/mom_cap_methods.F90
index 1e88dfc5a4..af8013efda 100644
--- a/config_src/nuopc_driver/mom_cap_methods.F90
+++ b/config_src/nuopc_driver/mom_cap_methods.F90
@@ -4,7 +4,9 @@ module mom_cap_methods
   ! This file is part of MOM6. See LICENSE.md for the license.
 
   ! mct modules
-  use ESMF
+  use ESMF,                only: ESMF_time, ESMF_ClockGet, ESMF_TimeGet, ESMF_State, ESMF_Clock
+  use ESMF,                only: ESMF_KIND_R8, ESMF_Field, ESMF_SUCCESS, ESMF_LogFoundError
+  use ESMF,                only: ESMF_LOGERR_PASSTHRU, ESMF_StateGet, ESMF_FieldGet
   use perf_mod,            only: t_startf, t_stopf
   use MOM_ocean_model,     only: ocean_public_type, ocean_state_type
   use MOM_surface_forcing, only: ice_ocean_boundary_type
@@ -550,7 +552,7 @@ subroutine mom_import(ocean_public, grid, importState, ice_ocean_boundary, &
           write(logunit,F01)'import: day, secs, j, i, t_flux          = '&
                             ,day,secs,j,i,ice_ocean_boundary%t_flux(i-i0,j-j0)
           !write(logunit,F01)'import: day, secs, j, i, latent_flux     = '&
-                            ,day,secs,j,i,ice_ocean_boundary%latent_flux(i-i0,j-j0)
+          !                  ,day,secs,j,i,ice_ocean_boundary%latent_flux(i-i0,j-j0)
           write(logunit,F01)'import: day, secs, j, i, runoff          = '&
                             ,day,secs,j,i,ice_ocean_boundary%runoff(i-i0,j-j0)
           write(logunit,F01)'import: day, secs, j, i, psurf           = '&