diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index f69aa441e..075e9fc09 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -186,6 +186,13 @@
     <desc>username of user who created case</desc>
   </entry>
 
+  <entry id="CASE_HASH">
+    <type>char</type>
+    <group>case_desc</group>
+    <file>env_case.xml</file>
+    <desc>Unique identifier for case</desc>
+  </entry>
+
   <!-- ===================================================================== -->
   <!-- definitions runtimes -->
   <!-- ===================================================================== -->
diff --git a/mediator/esmFlds.F90 b/mediator/esmFlds.F90
index 13ed53c14..58dfb5d19 100644
--- a/mediator/esmFlds.F90
+++ b/mediator/esmFlds.F90
@@ -363,12 +363,8 @@ subroutine med_fldList_Realize(state, fldList, flds_scalar_name, flds_scalar_num
     use ESMF              , only : ESMF_StateGet, ESMF_LogFoundError
     use ESMF              , only : ESMF_LogWrite, ESMF_LOGMSG_ERROR, ESMF_FAILURE, ESMF_LOGERR_PASSTHRU
     use ESMF              , only : ESMF_LOGMSG_INFO, ESMF_StateRemove, ESMF_SUCCESS
-#if ESMF_VERSION_MAJOR >= 8
-#if ESMF_VERSION_MINOR >  0
     use ESMF              , only : ESMF_STATEINTENT_IMPORT, ESMF_STATEINTENT_EXPORT, ESMF_StateIntent_Flag
     use ESMF              , only : ESMF_RC_ARG_BAD, ESMF_LogSetError, operator(==)
-#endif
-#endif
     ! input/output variables
     type(ESMF_State)            , intent(inout)            :: state
     type(med_fldlist_type), intent(in)               :: fldList
@@ -386,11 +382,7 @@ subroutine med_fldList_Realize(state, fldList, flds_scalar_name, flds_scalar_num
     character(CS)                   :: shortname
     character(CS)                   :: stdname
     character(ESMF_MAXSTR)          :: transferActionAttr
-#if ESMF_VERSION_MAJOR >= 8
-#if ESMF_VERSION_MINOR >  0
     type(ESMF_StateIntent_Flag)     :: stateIntent
-#endif
-#endif
     character(ESMF_MAXSTR)          :: transferAction
     character(ESMF_MAXSTR), pointer :: StandardNameList(:) => null()
     character(ESMF_MAXSTR), pointer :: ConnectedList(:) => null()
@@ -454,9 +446,6 @@ subroutine med_fldList_Realize(state, fldList, flds_scalar_name, flds_scalar_num
 #endif
 
     nflds = size(fldList%flds)
-    transferActionAttr="TransferActionGeomObject"
-#if ESMF_VERSION_MAJOR >= 8
-#if ESMF_VERSION_MINOR >  0
     call ESMF_StateGet(state, stateIntent=stateIntent, rc=rc)
     if (stateIntent==ESMF_STATEINTENT_EXPORT) then
        transferActionAttr="ProducerTransferAction"
@@ -470,8 +459,6 @@ subroutine med_fldList_Realize(state, fldList, flds_scalar_name, flds_scalar_num
             rcToReturn=rc)
        return  ! bail out
     endif
-#endif
-#endif
 
     do n = 1, nflds
        shortname = fldList%flds(n)%shortname
diff --git a/mediator/esmFldsExchange_hafs_mod.F90 b/mediator/esmFldsExchange_hafs_mod.F90
index 1786f3684..22ef604af 100644
--- a/mediator/esmFldsExchange_hafs_mod.F90
+++ b/mediator/esmFldsExchange_hafs_mod.F90
@@ -930,28 +930,9 @@ subroutine esmFldsExchange_hafs_attr(gcomp, hafs_attr, rc)
     rc = ESMF_SUCCESS
 
     ! Query component for name, verbosity, and diagnostic values
-#if ESMF_VERSION_MAJOR >= 8
     call NUOPC_CompGet(gcomp, name=cname, verbosity=verbosity, &
       diagnostic=diagnostic, rc=rc)
     if (chkerr(rc,__LINE__,u_FILE_u)) return
-#else
-    call ESMF_GridCompGet(gcomp, name=cname, rc=rc)
-    if (chkerr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_AttributeGet(gcomp, name="Verbosity", value=cvalue, &
-      defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
-    if (chkerr(rc,__LINE__,u_FILE_u)) return
-    verbosity = ESMF_UtilString2Int(cvalue, &
-      specialStringList=(/"off ","low ","high","max "/), &
-      specialValueList=(/0,9985,32513,131071/), rc=rc)
-    if (chkerr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_AttributeGet(gcomp, name="Diagnostic", value=cvalue, &
-      defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
-    if (chkerr(rc,__LINE__,u_FILE_u)) return
-    diagnostic = ESMF_UtilString2Int(cvalue, &
-      specialStringList=(/"off ","max "/), &
-      specialValueList=(/0,131071/), rc=rc)
-    if (chkerr(rc,__LINE__,u_FILE_u)) return
-#endif
 
     !----------------------------------------------------------
     ! Initialize system type
diff --git a/mediator/med.F90 b/mediator/med.F90
index f382c0521..93953ab6e 100644
--- a/mediator/med.F90
+++ b/mediator/med.F90
@@ -990,12 +990,9 @@ subroutine InitializeIPDv03p3(gcomp, importState, exportState, clock, rc)
     use ESMF , only : ESMF_GridComp, ESMF_State, ESMF_Clock, ESMF_VM, ESMF_SUCCESS
     use ESMF , only : ESMF_LogWrite, ESMF_LOGMSG_INFO, ESMF_TimeInterval
     use ESMF , only : ESMF_VMGet, ESMF_StateIsCreated, ESMF_GridCompGet
-#if ESMF_VERSION_MAJOR >= 8
-#if ESMF_VERSION_MINOR >  0
     use ESMF , only : ESMF_StateSet, ESMF_StateIntent_Import, ESMF_StateIntent_Export
     use ESMF , only : ESMF_StateIntent_Flag
-#endif
-#endif
+
     ! Input/output variables
     type(ESMF_GridComp)  :: gcomp
     type(ESMF_State)     :: importState, exportState
@@ -1026,24 +1023,16 @@ subroutine InitializeIPDv03p3(gcomp, importState, exportState, clock, rc)
     ! Realize States
     do n = 1,ncomps
       if (ESMF_StateIsCreated(is_local%wrap%NStateImp(n), rc=rc)) then
-#if ESMF_VERSION_MAJOR >= 8
-#if ESMF_VERSION_MINOR >  0
          call ESMF_StateSet(is_local%wrap%NStateImp(n), stateIntent=ESMF_StateIntent_Import, rc=rc)
          if (ChkErr(rc,__LINE__,u_FILE_u)) return
-#endif
-#endif
          call med_fldList_Realize(is_local%wrap%NStateImp(n), fldListFr(n), &
               is_local%wrap%flds_scalar_name, is_local%wrap%flds_scalar_num, &
               tag=subname//':Fr_'//trim(compname(n)), rc=rc)
          if (ChkErr(rc,__LINE__,u_FILE_u)) return
       endif
       if (ESMF_StateIsCreated(is_local%wrap%NStateExp(n), rc=rc)) then
-#if ESMF_VERSION_MAJOR >= 8
-#if ESMF_VERSION_MINOR >  0
           call ESMF_StateSet(is_local%wrap%NStateExp(n), stateIntent=ESMF_StateIntent_Export, rc=rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
-#endif
-#endif
           call med_fldList_Realize(is_local%wrap%NStateExp(n), fldListTo(n), &
               is_local%wrap%flds_scalar_name, is_local%wrap%flds_scalar_num, &
               tag=subname//':To_'//trim(compname(n)), rc=rc)