diff --git a/src/core/MOM.F90 b/src/core/MOM.F90
index c8573a2c06..6cef9a6b30 100644
--- a/src/core/MOM.F90
+++ b/src/core/MOM.F90
@@ -135,14 +135,12 @@ module MOM
 use MOM_tracer_flow_control,   only : tracer_flow_control_init, call_tracer_surface_state
 use MOM_tracer_flow_control,   only : tracer_flow_control_end, call_tracer_register_obc_segments
 use MOM_transcribe_grid,       only : copy_dyngrid_to_MOM_grid, copy_MOM_grid_to_dyngrid
-use MOM_unit_scaling,          only : unit_scale_type, unit_scaling_init
-use MOM_unit_scaling,          only : unit_scaling_end, fix_restart_unit_scaling
+use MOM_unit_scaling,          only : unit_scale_type, unit_scaling_init, unit_scaling_end
 use MOM_variables,             only : surface, allocate_surface_state, deallocate_surface_state
 use MOM_variables,             only : thermo_var_ptrs, vertvisc_type, porous_barrier_type
 use MOM_variables,             only : accel_diag_ptrs, cont_diag_ptrs, ocean_internal_state
 use MOM_variables,             only : rotate_surface_state
 use MOM_verticalGrid,          only : verticalGrid_type, verticalGridInit, verticalGridEnd
-use MOM_verticalGrid,          only : fix_restart_scaling
 use MOM_verticalGrid,          only : get_thickness_units, get_flux_units, get_tr_flux_units
 use MOM_wave_interface,        only : wave_parameters_CS, waves_end, waves_register_restarts
 use MOM_wave_interface,        only : Update_Stokes_Drift
@@ -1978,7 +1976,6 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
   real :: conv2watt            ! A conversion factor from temperature fluxes to heat
                                ! fluxes [J m-2 H-1 C-1 ~> J m-3 degC-1 or J kg-1 degC-1]
   real :: conv2salt            ! A conversion factor for salt fluxes [m H-1 ~> 1] or [kg m-2 H-1 ~> 1]
-  real :: RL2_T2_rescale, Z_rescale, QRZ_rescale ! Unit conversion factors
   character(len=48) :: S_flux_units
 
   type(vardesc) :: vd_T, vd_S  ! Structures describing temperature and salinity variables.
@@ -3117,16 +3114,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
   call register_obsolete_diagnostics(param_file, CS%diag)
 
   if (use_frazil) then
-    if (query_initialized(CS%tv%frazil, "frazil", restart_CSp)) then
-      ! Test whether the dimensional rescaling has changed for heat content.
-      if ((US%J_kg_to_Q_restart*US%kg_m3_to_R_restart*US%m_to_Z_restart /= 0.0) .and. &
-          (US%J_kg_to_Q_restart*US%kg_m3_to_R_restart*US%m_to_Z_restart /= 1.0) ) then
-        QRZ_rescale = 1.0 / (US%J_kg_to_Q_restart*US%kg_m3_to_R_restart*US%m_to_Z_restart)
-        do j=js,je ; do i=is,ie
-          CS%tv%frazil(i,j) = QRZ_rescale * CS%tv%frazil(i,j)
-        enddo ; enddo
-      endif
-    else
+    if (.not.query_initialized(CS%tv%frazil, "frazil", restart_CSp)) then
       CS%tv%frazil(:,:) = 0.0
       call set_initialized(CS%tv%frazil, "frazil", restart_CSp)
     endif
@@ -3136,39 +3124,11 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
     CS%p_surf_prev_set = query_initialized(CS%p_surf_prev, "p_surf_prev", restart_CSp)
 
     if (CS%p_surf_prev_set) then
-      ! Test whether the dimensional rescaling has changed for pressure.
-      if ((US%kg_m3_to_R_restart*US%s_to_T_restart*US%m_to_L_restart /= 0.0) .and. &
-          (US%s_to_T_restart**2 /= US%kg_m3_to_R_restart * US%m_to_L_restart**2) ) then
-        RL2_T2_rescale = US%s_to_T_restart**2 / (US%kg_m3_to_R_restart*US%m_to_L_restart**2)
-        do j=js,je ; do i=is,ie
-          CS%p_surf_prev(i,j) = RL2_T2_rescale * CS%p_surf_prev(i,j)
-        enddo ; enddo
-      endif
-
       call pass_var(CS%p_surf_prev, G%domain)
     endif
   endif
 
-  if (use_ice_shelf .and. associated(CS%Hml)) then
-    if (query_initialized(CS%Hml, "hML", restart_CSp)) then
-      ! Test whether the dimensional rescaling has changed for depths.
-      if ((US%m_to_Z_restart /= 0.0) .and. (US%m_to_Z_restart /= 1.0) ) then
-        Z_rescale = 1.0 / US%m_to_Z_restart
-        do j=js,je ; do i=is,ie
-          CS%Hml(i,j) = Z_rescale * CS%Hml(i,j)
-        enddo ; enddo
-      endif
-    endif
-  endif
-
-  if (query_initialized(CS%ave_ssh_ibc, "ave_ssh", restart_CSp)) then
-    if ((US%m_to_Z_restart /= 0.0) .and. (US%m_to_Z_restart /= 1.0) ) then
-      Z_rescale = 1.0 / US%m_to_Z_restart
-      do j=js,je ; do i=is,ie
-        CS%ave_ssh_ibc(i,j) = Z_rescale * CS%ave_ssh_ibc(i,j)
-      enddo ; enddo
-    endif
-  else
+  if (.not.query_initialized(CS%ave_ssh_ibc, "ave_ssh", restart_CSp)) then
     if (CS%split) then
       call find_eta(CS%h, CS%tv, G, GV, US, CS%ave_ssh_ibc, eta, dZref=G%Z_ref)
     else
@@ -3195,10 +3155,6 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
   ! initialize stochastic physics
   call stochastics_init(CS%dt_therm, CS%G, CS%GV, CS%stoch_CS, param_file, diag, Time)
 
-  !### This could perhaps go here instead of in finish_MOM_initialization?
-  ! call fix_restart_scaling(GV)
-  ! call fix_restart_unit_scaling(US)
-
   call callTree_leave("initialize_MOM()")
   call cpu_clock_end(id_clock_init)
 
@@ -3226,11 +3182,6 @@ subroutine finish_MOM_initialization(Time, dirs, CS, restart_CSp)
   ! Pointers for convenience
   G => CS%G ; GV => CS%GV ; US => CS%US
 
-  !### Move to initialize_MOM?
-  call fix_restart_scaling(GV, unscaled=.true.)
-  call fix_restart_unit_scaling(US, unscaled=.true.)
-
-
   if (CS%use_particles) then
     call particles_init(CS%particles, G, CS%Time, CS%dt_therm, CS%u, CS%v)
   endif
@@ -3382,18 +3333,6 @@ subroutine set_restart_fields(GV, US, param_file, CS, restart_CSp)
   endif
 
   ! Register scalar unit conversion factors.
-  call register_restart_field(US%m_to_Z_restart, "m_to_Z", .false., restart_CSp, &
-                              "Height unit conversion factor", "Z meter-1")
-  call register_restart_field(GV%m_to_H_restart, "m_to_H", .false., restart_CSp, &
-                              "Thickness unit conversion factor", "H meter-1")
-  call register_restart_field(US%m_to_L_restart, "m_to_L", .false., restart_CSp, &
-                              "Length unit conversion factor", "L meter-1")
-  call register_restart_field(US%s_to_T_restart, "s_to_T", .false., restart_CSp, &
-                              "Time unit conversion factor", "T second-1")
-  call register_restart_field(US%kg_m3_to_R_restart, "kg_m3_to_R", .false., restart_CSp, &
-                              "Density unit conversion factor", "R m3 kg-1")
-  call register_restart_field(US%J_kg_to_Q_restart, "J_kg_to_Q", .false., restart_CSp, &
-                              "Heat content unit conversion factor.", units="Q kg J-1")
   call register_restart_field(CS%first_dir_restart, "First_direction", .false., restart_CSp, &
                               "Indicator of the first direction in split calculations.", "nondim")
 
diff --git a/src/core/MOM_barotropic.F90 b/src/core/MOM_barotropic.F90
index d6d4199212..40f759f4b8 100644
--- a/src/core/MOM_barotropic.F90
+++ b/src/core/MOM_barotropic.F90
@@ -4318,8 +4318,6 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
                                        ! drag piston velocity.
   character(len=80)  :: wave_drag_var  ! The wave drag piston velocity variable
                                        ! name in wave_drag_file.
-  real :: vel_rescale ! A rescaling factor for horizontal velocity from the representation in
-                      ! a restart file to the internal representation in this run.
   real :: mean_SL     ! The mean sea level that is used along with the bathymetry to estimate the
                       ! geometry when LINEARIZED_BT_CORIOLIS is true or BT_NONLIN_STRESS is false [Z ~> m].
   real :: det_de      ! The partial derivative due to self-attraction and loading of the reference
@@ -4788,8 +4786,6 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
   dtbt_tmp = -1.0
   if (query_initialized(CS%dtbt, "DTBT", restart_CS)) then
     dtbt_tmp = CS%dtbt
-    if ((US%s_to_T_restart /= 0.0) .and. (US%s_to_T_restart /= 1.0)) &
-      dtbt_tmp = (1.0 / US%s_to_T_restart) * CS%dtbt
   endif
 
   ! Estimate the maximum stable barotropic time step.
@@ -4948,11 +4944,6 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
     do k=1,nz ; do J=js-1,je ; do i=is,ie
       CS%vbtav(i,J) = CS%vbtav(i,J) + CS%frhatv(i,J,k) * v(i,J,k)
     enddo ; enddo ; enddo
-  elseif ((US%s_to_T_restart*US%m_to_L_restart /= 0.0) .and. &
-          (US%s_to_T_restart /= US%m_to_L_restart)) then
-    vel_rescale = US%s_to_T_restart / US%m_to_L_restart
-    do j=js,je ; do I=is-1,ie ; CS%ubtav(I,j) = vel_rescale * CS%ubtav(I,j) ; enddo ; enddo
-    do J=js-1,je ; do i=is,ie ; CS%vbtav(i,J) = vel_rescale * CS%vbtav(i,J) ; enddo ; enddo
   endif
 
   if (CS%gradual_BT_ICs) then
@@ -4960,11 +4951,6 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
         .NOT.query_initialized(CS%vbt_IC,"vbt_IC",restart_CS)) then
       do j=js,je ; do I=is-1,ie ; CS%ubt_IC(I,j) = CS%ubtav(I,j) ; enddo ; enddo
       do J=js-1,je ; do i=is,ie ; CS%vbt_IC(i,J) = CS%vbtav(i,J) ; enddo ; enddo
-    elseif ((US%s_to_T_restart*US%m_to_L_restart /= 0.0) .and. &
-            (US%s_to_T_restart /= US%m_to_L_restart)) then
-      vel_rescale = US%s_to_T_restart / US%m_to_L_restart
-      do j=js,je ; do I=is-1,ie ; CS%ubt_IC(I,j) = vel_rescale * CS%ubt_IC(I,j) ; enddo ; enddo
-      do J=js-1,je ; do i=is,ie ; CS%vbt_IC(i,J) = vel_rescale * CS%vbt_IC(i,J) ; enddo ; enddo
     endif
   endif
 !   Calculate other constants which are used for btstep.
diff --git a/src/core/MOM_dynamics_split_RK2.F90 b/src/core/MOM_dynamics_split_RK2.F90
index 143006b49d..9fb1a6b356 100644
--- a/src/core/MOM_dynamics_split_RK2.F90
+++ b/src/core/MOM_dynamics_split_RK2.F90
@@ -1246,14 +1246,6 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, US, param
   ! This include declares and sets the variable "version".
 # include "version_variable.h"
   character(len=48) :: thickness_units, flux_units, eta_rest_name
-  real :: H_rescale  ! A rescaling factor for thicknesses from the representation in a
-                     ! restart file to the internal representation in this run  [various units ~> 1]
-  real :: vel_rescale ! A rescaling factor for velocities from the representation in a
-                     ! restart file to the internal representation in this run  [various units ~> 1]
-  real :: uH_rescale ! A rescaling factor for thickness transports from the representation in a
-                     ! restart file to the internal representation in this run  [various units ~> 1]
-  real :: accel_rescale ! A rescaling factor for accelerations from the representation in a
-                     ! restart file to the internal representation in this run  [various units ~> 1]
   type(group_pass_type) :: pass_av_h_uvh
   logical :: debug_truncations
   logical :: read_uv, read_h2
@@ -1410,9 +1402,6 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, US, param
       CS%eta(i,j) = CS%eta(i,j) + h(i,j,k)
     enddo ; enddo ; enddo
     call set_initialized(CS%eta, trim(eta_rest_name), restart_CS)
-  elseif ((GV%m_to_H_restart /= 0.0) .and. (GV%m_to_H_restart /= 1.0)) then
-    H_rescale = 1.0 / GV%m_to_H_restart
-    do j=js,je ; do i=is,ie ; CS%eta(i,j) = H_rescale * CS%eta(i,j) ; enddo ; enddo
   endif
   ! Copy eta into an output array.
   do j=js,je ; do i=is,ie ; eta(i,j) = CS%eta(i,j) ; enddo ; enddo
@@ -1427,17 +1416,6 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, US, param
                               OBC=CS%OBC, BT=CS%barotropic_CSp, TD=thickness_diffuse_CSp)
     call set_initialized(CS%diffu, "diffu", restart_CS)
     call set_initialized(CS%diffv, "diffv", restart_CS)
-  else
-    if ( (US%s_to_T_restart * US%m_to_L_restart /= 0.0) .and. &
-         (US%s_to_T_restart**2 /= US%m_to_L_restart) ) then
-      accel_rescale = US%s_to_T_restart**2 / US%m_to_L_restart
-      do k=1,nz ; do j=js,je ; do I=G%IscB,G%IecB
-        CS%diffu(I,j,k) = accel_rescale * CS%diffu(I,j,k)
-      enddo ; enddo ; enddo
-      do k=1,nz ; do J=G%JscB,G%JecB ; do i=is,ie
-        CS%diffv(i,J,k) = accel_rescale * CS%diffv(i,J,k)
-      enddo ; enddo ; enddo
-    endif
   endif
 
   if (.not. query_initialized(CS%u_av, "u2", restart_CS) .or. &
@@ -1446,11 +1424,6 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, US, param
     do k=1,nz ; do J=JsdB,JedB ; do i=isd,ied ; CS%v_av(i,J,k) = v(i,J,k) ; enddo ; enddo ; enddo
     call set_initialized(CS%u_av, "u2", restart_CS)
     call set_initialized(CS%v_av, "v2", restart_CS)
-  elseif ( (US%s_to_T_restart * US%m_to_L_restart /= 0.0) .and. &
-           (US%s_to_T_restart /= US%m_to_L_restart) ) then
-    vel_rescale = US%s_to_T_restart / US%m_to_L_restart
-    do k=1,nz ; do j=jsd,jed ; do I=IsdB,IedB ; CS%u_av(I,j,k) = vel_rescale * CS%u_av(I,j,k) ; enddo ; enddo ; enddo
-    do k=1,nz ; do J=JsdB,JedB ; do i=isd,ied ; CS%v_av(i,J,k) = vel_rescale * CS%v_av(i,J,k) ; enddo ; enddo ; enddo
   endif
 
   if (CS%store_CAu) then
@@ -1504,15 +1477,6 @@ subroutine initialize_dyn_split_RK2(u, v, h, uh, vh, eta, Time, G, GV, US, param
       if (.not. query_initialized(CS%h_av, "h2", restart_CS)) then
         CS%h_av(:,:,:) = h(:,:,:)
         call set_initialized(CS%h_av, "h2", restart_CS)
-      elseif ((GV%m_to_H_restart /= 0.0) .and. (GV%m_to_H_restart /= 1.0)) then
-        H_rescale = 1.0 / GV%m_to_H_restart
-        do k=1,nz ; do j=js,je ; do i=is,ie ; CS%h_av(i,j,k) = H_rescale * CS%h_av(i,j,k) ; enddo ; enddo ; enddo
-      endif
-      if ( (GV%m_to_H_restart * US%s_to_T_restart * US%m_to_L_restart /= 0.0) .and. &
-           (US%s_to_T_restart /= (GV%m_to_H_restart * US%m_to_L_restart**2)) ) then
-        uH_rescale = US%s_to_T_restart / (GV%m_to_H_restart * US%m_to_L_restart**2)
-        do k=1,nz ; do j=js,je ; do I=G%IscB,G%IecB ; uh(I,j,k) = uH_rescale * uh(I,j,k) ; enddo ; enddo ; enddo
-        do k=1,nz ; do J=G%JscB,G%JecB ; do i=is,ie ; vh(i,J,k) = uH_rescale * vh(i,J,k) ; enddo ; enddo ; enddo
       endif
     endif
   endif
diff --git a/src/core/MOM_verticalGrid.F90 b/src/core/MOM_verticalGrid.F90
index f20c7bbd26..d6003ca626 100644
--- a/src/core/MOM_verticalGrid.F90
+++ b/src/core/MOM_verticalGrid.F90
@@ -12,7 +12,7 @@ module MOM_verticalGrid
 #include <MOM_memory.h>
 
 public verticalGridInit, verticalGridEnd
-public setVerticalGridAxes, fix_restart_scaling
+public setVerticalGridAxes
 public get_flux_units, get_thickness_units, get_tr_flux_units
 
 ! A note on unit descriptions in comments: MOM6 uses units that can be rescaled for dimensional
@@ -75,7 +75,7 @@ module MOM_verticalGrid
   real :: H_to_MKS      !< A constant that translates thickness units to its MKS unit
                         !! (m or kg m-2) based on GV%Boussinesq [m H-1 ~> 1] or [kg m-2 H-1 ~> 1]
 
-  real :: m_to_H_restart = 0.0 !< A copy of the m_to_H that is used in restart files.
+  real :: m_to_H_restart = 1.0 !< A copy of the m_to_H that is used in restart files.
 end type verticalGrid_type
 
 contains
@@ -187,20 +187,6 @@ subroutine verticalGridInit( param_file, GV, US )
 
 end subroutine verticalGridInit
 
-!> Set the scaling factors for restart files to the scaling factors for this run.
-subroutine fix_restart_scaling(GV, unscaled)
-  type(verticalGrid_type), intent(inout) :: GV   !< The ocean's vertical grid structure
-  logical,       optional, intent(in)    :: unscaled !< If true, set the restart factors as though the
-                                             !! model would be unscaled, which is appropriate if the
-                                             !! scaling is undone when writing a restart file.
-
-  GV%m_to_H_restart = GV%m_to_H
-  if (present(unscaled)) then ; if (unscaled) then
-    GV%m_to_H_restart = 1.0
-  endif ; endif
-
-end subroutine fix_restart_scaling
-
 !> Returns the model's thickness units, usually m or kg/m^2.
 function get_thickness_units(GV)
   character(len=48)                   :: get_thickness_units !< The vertical thickness units
diff --git a/src/framework/MOM_unit_scaling.F90 b/src/framework/MOM_unit_scaling.F90
index 6f9a7a5f5f..482c2eec7a 100644
--- a/src/framework/MOM_unit_scaling.F90
+++ b/src/framework/MOM_unit_scaling.F90
@@ -55,12 +55,12 @@ module MOM_unit_scaling
   real :: Pa_to_RL2_T2    !< Convert pressures from Pa to R L2 T-2                                [R L2 T-2 Pa-1 ~> 1]
   real :: Pa_to_RLZ_T2    !< Convert wind stresses from Pa to R L Z T-2                          [R L Z T-2 Pa-1 ~> 1]
 
-  ! These are used for changing scaling across restarts.
-  real :: m_to_Z_restart = 0.0 !< A copy of the m_to_Z that is used in restart files.
-  real :: m_to_L_restart = 0.0 !< A copy of the m_to_L that is used in restart files.
-  real :: s_to_T_restart = 0.0 !< A copy of the s_to_T that is used in restart files.
-  real :: kg_m3_to_R_restart = 0.0 !< A copy of the kg_m3_to_R that is used in restart files.
-  real :: J_kg_to_Q_restart = 0.0 !< A copy of the J_kg_to_Q that is used in restart files.
+  ! These are no longer used for changing scaling across restarts.
+  real :: m_to_Z_restart = 1.0 !< A copy of the m_to_Z that is used in restart files.
+  real :: m_to_L_restart = 1.0 !< A copy of the m_to_L that is used in restart files.
+  real :: s_to_T_restart = 1.0 !< A copy of the s_to_T that is used in restart files.
+  real :: kg_m3_to_R_restart = 1.0 !< A copy of the kg_m3_to_R that is used in restart files.
+  real :: J_kg_to_Q_restart = 1.0 !< A copy of the J_kg_to_Q that is used in restart files.
 end type unit_scale_type
 
 contains
@@ -233,11 +233,11 @@ subroutine fix_restart_unit_scaling(US, unscaled)
                                              !! model would be unscaled, which is appropriate if the
                                              !! scaling is undone when writing a restart file.
 
-  US%m_to_Z_restart = US%m_to_Z
-  US%m_to_L_restart = US%m_to_L
-  US%s_to_T_restart = US%s_to_T
-  US%kg_m3_to_R_restart = US%kg_m3_to_R
-  US%J_kg_to_Q_restart = US%J_kg_to_Q
+  US%m_to_Z_restart = 1.0 ! US%m_to_Z
+  US%m_to_L_restart = 1.0 ! US%m_to_L
+  US%s_to_T_restart = 1.0 ! US%s_to_T
+  US%kg_m3_to_R_restart = 1.0 ! US%kg_m3_to_R
+  US%J_kg_to_Q_restart = 1.0 ! US%J_kg_to_Q
 
   if (present(unscaled)) then ; if (unscaled) then
     US%m_to_Z_restart = 1.0
diff --git a/src/ice_shelf/MOM_ice_shelf.F90 b/src/ice_shelf/MOM_ice_shelf.F90
index a78c17803c..113b6c045b 100644
--- a/src/ice_shelf/MOM_ice_shelf.F90
+++ b/src/ice_shelf/MOM_ice_shelf.F90
@@ -1222,12 +1222,6 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, forces_in,
                                           !! the ice-shelf state
   type(directories)  :: dirs
   type(dyn_horgrid_type), pointer :: dG => NULL()
-  real    :: Z_rescale  ! A rescaling factor for heights from the representation in
-                        ! a restart file to the internal representation in this run.
-  real    :: RZ_rescale ! A rescaling factor for mass loads from the representation in
-                        ! a restart file to the internal representation in this run.
-  real    :: L_rescale  ! A rescaling factor for horizontal lengths from the representation in
-                        ! a restart file to the internal representation in this run.
   real :: meltrate_conversion ! The conversion factor to use for in the melt rate diagnostic.
   real :: dz_ocean_min_float ! The minimum ocean thickness above which the ice shelf is considered
                         ! to be floating when CONST_SEA_LEVEL = True [Z ~> m].
@@ -1675,12 +1669,6 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, forces_in,
     endif
   endif
 
-  call register_restart_field(US%m_to_Z_restart, "m_to_Z", .false., CS%restart_CSp, &
-                              "Height unit conversion factor", "Z meter-1")
-  call register_restart_field(US%m_to_L_restart, "m_to_L", .false., CS%restart_CSp, &
-                              "Length unit conversion factor", "L meter-1")
-  call register_restart_field(US%kg_m3_to_R_restart, "kg_m3_to_R", .false., CS%restart_CSp, &
-                              "Density unit conversion factor", "R m3 kg-1")
   if (CS%active_shelf_dynamics) then
     call register_restart_field(ISS%hmask, "h_mask", .true., CS%restart_CSp, &
                                 "ice sheet/shelf thickness mask" ,"none")
@@ -1723,28 +1711,6 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, forces_in,
     call MOM_mesg("MOM_ice_shelf.F90, initialize_ice_shelf: Restoring ice shelf from file.")
     call restore_state(dirs%input_filename, dirs%restart_input_dir, Time, G, CS%restart_CSp)
 
-    if ((US%m_to_Z_restart /= 0.0) .and. (US%m_to_Z_restart /= 1.0)) then
-      Z_rescale = 1.0 / US%m_to_Z_restart
-      do j=G%jsc,G%jec ; do i=G%isc,G%iec
-        ISS%h_shelf(i,j) = Z_rescale * ISS%h_shelf(i,j)
-      enddo ; enddo
-    endif
-
-    if ((US%m_to_Z_restart*US%kg_m3_to_R_restart /= 0.0) .and. &
-        (US%m_to_Z_restart*US%kg_m3_to_R_restart /= 1.0)) then
-      RZ_rescale = 1.0 / (US%m_to_Z_restart * US%kg_m3_to_R_restart)
-      do j=G%jsc,G%jec ; do i=G%isc,G%iec
-        ISS%mass_shelf(i,j) = RZ_rescale * ISS%mass_shelf(i,j)
-      enddo ; enddo
-    endif
-
-    if ((US%m_to_L_restart /= 0.0) .and. (US%m_to_L_restart /= 1.0)) then
-      L_rescale = 1.0 / US%m_to_L_restart
-      do j=G%jsc,G%jec ; do i=G%isc,G%iec
-        ISS%area_shelf_h(i,j) = L_rescale**2 * ISS%area_shelf_h(i,j)
-      enddo ; enddo
-    endif
-
   endif ! .not. new_sim
 
 !  do j=G%jsc,G%jec ; do i=G%isc,G%iec
diff --git a/src/ice_shelf/MOM_ice_shelf_dynamics.F90 b/src/ice_shelf/MOM_ice_shelf_dynamics.F90
index 3049cae00c..9b584ae0f9 100644
--- a/src/ice_shelf/MOM_ice_shelf_dynamics.F90
+++ b/src/ice_shelf/MOM_ice_shelf_dynamics.F90
@@ -330,10 +330,6 @@ subroutine initialize_ice_shelf_dyn(param_file, Time, ISS, CS, G, US, diag, new_
                                                  !! a solo ice-sheet driver.
 
   ! Local variables
-  real    :: Z_rescale  ! A rescaling factor for heights from the representation in
-                        ! a restart file to the internal representation in this run.
-  real    :: vel_rescale ! A rescaling factor for horizontal velocities from the representation
-                        ! in a restart file to the internal representation in this run.
   real    :: T_shelf_bdry ! A default ice shelf temperature to use for ice flowing
                           ! in through open boundaries [C ~> degC]
   !This include declares and sets the variable "version".
@@ -485,21 +481,6 @@ subroutine initialize_ice_shelf_dyn(param_file, Time, ISS, CS, G, US, diag, new_
 
   ! Take additional initialization steps, for example of dependent variables.
   if (active_shelf_dynamics .and. .not.new_sim) then
-    if ((US%m_to_Z_restart /= 0.0) .and. (US%m_to_Z_restart /= 1.0)) then
-      Z_rescale = 1.0 / US%m_to_Z_restart
-      do j=G%jsc,G%jec ; do i=G%isc,G%iec
-        CS%OD_av(i,j) = Z_rescale * CS%OD_av(i,j)
-      enddo ; enddo
-    endif
-
-    if ((US%m_to_L_restart*US%s_to_T_restart /= 0.0) .and. &
-        (US%m_to_L_restart /= US%s_to_T_restart)) then
-      vel_rescale = US%s_to_T_restart / US%m_to_L_restart
-      do J=G%jsc-1,G%jec ; do I=G%isc-1,G%iec
-        CS%u_shelf(I,J) = vel_rescale * CS%u_shelf(I,J)
-        CS%v_shelf(I,J) = vel_rescale * CS%v_shelf(I,J)
-      enddo ; enddo
-    endif
 
     ! this is unfortunately necessary; if grid is not symmetric the boundary values
     !  of u and v are otherwise not set till the end of the first linear solve, and so
diff --git a/src/initialization/MOM_state_initialization.F90 b/src/initialization/MOM_state_initialization.F90
index 3975cd49ab..fccb47e69f 100644
--- a/src/initialization/MOM_state_initialization.F90
+++ b/src/initialization/MOM_state_initialization.F90
@@ -155,8 +155,6 @@ subroutine MOM_initialize_state(u, v, h, tv, Time, G, GV, US, PF, dirs, &
   character(len=200) :: config
   real :: H_rescale   ! A rescaling factor for thicknesses from the representation in
                       ! a restart file to the internal representation in this run [various units ~> 1]
-  real :: vel_rescale ! A rescaling factor for velocities from the representation in
-                      ! a restart file to the internal representation in this run [various units ~> 1]
   real :: dt          ! The baroclinic dynamics timestep for this run [T ~> s].
 
   logical :: from_Z_file, useALE
@@ -529,16 +527,6 @@ subroutine MOM_initialize_state(u, v, h, tv, Time, G, GV, US, PF, dirs, &
         "MOM6 attempted to restart from a file from a different time than given by Time_in.")
       Time = Time_in
     endif
-    if ((GV%m_to_H_restart /= 0.0) .and. (GV%m_to_H_restart /= 1.0)) then
-      H_rescale = 1.0 / GV%m_to_H_restart
-      do k=1,nz ; do j=js,je ; do i=is,ie ; h(i,j,k) = H_rescale * h(i,j,k) ; enddo ; enddo ; enddo
-    endif
-    if ( (US%s_to_T_restart * US%m_to_L_restart /= 0.0) .and. &
-         (US%s_to_T_restart /= US%m_to_L_restart) ) then
-      vel_rescale = US%s_to_T_restart /  US%m_to_L_restart
-      do k=1,nz ; do j=jsd,jed ; do I=IsdB,IeDB ; u(I,j,k) = vel_rescale * u(I,j,k) ; enddo ; enddo ; enddo
-      do k=1,nz ; do J=JsdB,JedB ; do i=isd,ied ; v(i,J,k) = vel_rescale * v(i,J,k) ; enddo ; enddo ; enddo
-    endif
   endif
 
   if ( use_temperature ) then
diff --git a/src/parameterizations/lateral/MOM_MEKE.F90 b/src/parameterizations/lateral/MOM_MEKE.F90
index add2d6a984..2a5cef5974 100644
--- a/src/parameterizations/lateral/MOM_MEKE.F90
+++ b/src/parameterizations/lateral/MOM_MEKE.F90
@@ -1101,10 +1101,6 @@ logical function MEKE_init(Time, G, US, param_file, diag, dbcomms_CS, CS, MEKE,
                                                              !! otherwise in tracer dynamics
 
   ! Local variables
-  real    :: I_T_rescale   ! A rescaling factor for time from the internal representation in this
-                           ! run to the representation in a restart file, [nondim]?
-  real    :: L_rescale     ! A rescaling factor for length from the internal representation in this
-                           ! run to the representation in a restart file, [nondim]?
   real    :: MEKE_restoring_timescale ! The timescale used to nudge MEKE toward its equilibrium value [T ~> s]
   real :: cdrag            ! The default bottom drag coefficient [nondim].
   character(len=200) :: eke_filename, eke_varname, inputdir
@@ -1439,47 +1435,6 @@ logical function MEKE_init(Time, G, US, param_file, diag, dbcomms_CS, CS, MEKE,
   if (CS%initialize) call MOM_error(WARNING, &
                        "MEKE_init: Initializing MEKE with a local equilibrium balance.")
 
-  ! Account for possible changes in dimensional scaling for variables that have been
-  ! read from a restart file.
-  I_T_rescale = 1.0
-  if ((US%s_to_T_restart /= 0.0) .and. (US%s_to_T_restart /= 1.0)) &
-    I_T_rescale = US%s_to_T_restart
-  L_rescale = 1.0
-  if ((US%m_to_L_restart /= 0.0) .and. (US%m_to_L_restart /= 1.0)) &
-    L_rescale = 1.0 / US%m_to_L_restart
-
-  if (L_rescale*I_T_rescale /= 1.0) then
-    if (allocated(MEKE%MEKE)) then ; if (query_initialized(MEKE%MEKE, "MEKE_MEKE", restart_CS)) then
-      do j=js,je ; do i=is,ie
-        MEKE%MEKE(i,j) = (L_rescale*I_T_rescale)**2 * MEKE%MEKE(i,j)
-      enddo ; enddo
-    endif ; endif
-  endif
-  if (L_rescale**2*I_T_rescale /= 1.0) then
-    if (allocated(MEKE%Kh)) then ; if (query_initialized(MEKE%Kh, "MEKE_Kh", restart_CS)) then
-      do j=js,je ; do i=is,ie
-        MEKE%Kh(i,j) = L_rescale**2*I_T_rescale * MEKE%Kh(i,j)
-      enddo ; enddo
-    endif ; endif
-    if (allocated(MEKE%Ku)) then ; if (query_initialized(MEKE%Ku, "MEKE_Ku", restart_CS)) then
-      do j=js,je ; do i=is,ie
-        MEKE%Ku(i,j) = L_rescale**2*I_T_rescale * MEKE%Ku(i,j)
-      enddo ; enddo
-    endif ; endif
-    if (allocated(MEKE%Kh_diff)) then ; if (query_initialized(MEKE%Kh, "MEKE_Kh_diff", restart_CS)) then
-      do j=js,je ; do i=is,ie
-        MEKE%Kh_diff(i,j) = L_rescale**2*I_T_rescale * MEKE%Kh_diff(i,j)
-      enddo ; enddo
-    endif ; endif
-  endif
-  if (L_rescale**4*I_T_rescale /= 1.0) then
-    if (allocated(MEKE%Au)) then ; if (query_initialized(MEKE%Au, "MEKE_Au", restart_CS)) then
-      do j=js,je ; do i=is,ie
-        MEKE%Au(i,j) = L_rescale**4*I_T_rescale * MEKE%Au(i,j)
-      enddo ; enddo
-    endif ; endif
-  endif
-
   ! Set up group passes.  In the case of a restart, these fields need a halo update now.
   if (allocated(MEKE%MEKE)) then
     call create_group_pass(CS%pass_MEKE, MEKE%MEKE, G%Domain)
diff --git a/src/parameterizations/lateral/MOM_mixed_layer_restrat.F90 b/src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
index ffdf236152..6c072d21d5 100644
--- a/src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+++ b/src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
@@ -849,8 +849,6 @@ logical function mixedlayer_restrat_init(Time, G, GV, US, param_file, diag, CS,
   type(MOM_restart_CS),        intent(in)    :: restart_CS !< MOM restart control structure
 
   ! Local variables
-  real :: H_rescale  ! A rescaling factor for thicknesses from the representation in
-                     ! a restart file to the internal representation in this run [nondim]?
   real :: flux_to_kg_per_s ! A unit conversion factor for fluxes. [kg T s-1 H-1 L-2 ~> kg m-3 or 1]
   real :: omega            ! The Earth's rotation rate [T-1 ~> s-1].
   real :: ustar_min_dflt   ! The default value for RESTRAT_USTAR_MIN [Z T-1 ~> m s-1]
@@ -993,26 +991,6 @@ logical function mixedlayer_restrat_init(Time, G, GV, US, param_file, diag, CS,
       'Surface meridional velocity component of mixed layer restratification', &
       'm s-1', conversion=US%L_T_to_m_s)
 
-  ! Rescale variables from restart files if the internal dimensional scalings have changed.
-  if (CS%MLE_MLD_decay_time>0. .or. CS%MLE_MLD_decay_time2>0.) then
-    if (query_initialized(CS%MLD_filtered, "MLD_MLE_filtered", restart_CS) .and. &
-        (GV%m_to_H_restart /= 0.0) .and. (GV%m_to_H_restart /= 1.0)) then
-      H_rescale = 1.0 / GV%m_to_H_restart
-      do j=G%jsc,G%jec ; do i=G%isc,G%iec
-        CS%MLD_filtered(i,j) = H_rescale * CS%MLD_filtered(i,j)
-      enddo ; enddo
-    endif
-  endif
-  if (CS%MLE_MLD_decay_time2>0.) then
-    if (query_initialized(CS%MLD_filtered_slow, "MLD_MLE_filtered_slow", restart_CS) .and. &
-        (GV%m_to_H_restart /= 0.0) .and. (GV%m_to_H_restart /= 1.0)) then
-      H_rescale = 1.0 / GV%m_to_H_restart
-      do j=G%jsc,G%jec ; do i=G%isc,G%iec
-        CS%MLD_filtered_slow(i,j) = H_rescale * CS%MLD_filtered_slow(i,j)
-      enddo ; enddo
-    endif
-  endif
-
   ! If MLD_filtered is being used, we need to update halo regions after a restart
   if (allocated(CS%MLD_filtered)) call pass_var(CS%MLD_filtered, G%domain)
 
diff --git a/src/parameterizations/vertical/MOM_set_viscosity.F90 b/src/parameterizations/vertical/MOM_set_viscosity.F90
index 1e3bf258d8..b38b4eea35 100644
--- a/src/parameterizations/vertical/MOM_set_viscosity.F90
+++ b/src/parameterizations/vertical/MOM_set_viscosity.F90
@@ -2003,12 +2003,6 @@ subroutine set_visc_init(Time, G, GV, US, param_file, diag, visc, CS, restart_CS
   real    :: Hbbl            ! The static bottom boundary layer thickness [Z ~> m].
   real    :: BBL_thick_min   ! The minimum bottom boundary layer thickness [Z ~> m].
 
-  real    :: Z_rescale     ! A rescaling factor for heights from the representation in
-                           ! a restart file to the internal representation in this run [nondim]?
-  real    :: I_T_rescale   ! A rescaling factor for time from the internal representation in this run
-                           ! to the representation in a restart file [nondim]?
-  real    :: Z2_T_rescale  ! A rescaling factor for vertical diffusivities and viscosities from the
-                           ! representation in a restart file to the internal representation in this run [nondim]?
   integer :: i, j, k, is, ie, js, je
   integer :: isd, ied, jsd, jed, IsdB, IedB, JsdB, JedB, nz
   integer :: default_answer_date  ! The default setting for the various ANSWER_DATE flags.
@@ -2317,42 +2311,6 @@ subroutine set_visc_init(Time, G, GV, US, param_file, diag, visc, CS, restart_CS
   call register_restart_field_as_obsolete('Kd_turb','Kd_shear', restart_CS)
   call register_restart_field_as_obsolete('Kv_turb','Kv_shear', restart_CS)
 
-  ! Account for possible changes in dimensional scaling for variables that have been
-  ! read from a restart file.
-  Z_rescale = 1.0
-  if (US%m_to_Z_restart /= 0.0) Z_rescale = 1.0 / US%m_to_Z_restart
-  I_T_rescale = 1.0
-  if (US%s_to_T_restart /= 0.0) I_T_rescale = US%s_to_T_restart
-  Z2_T_rescale = Z_rescale**2*I_T_rescale
-
-  if (Z2_T_rescale /= 1.0) then
-    if (associated(visc%Kd_shear)) then ; if (query_initialized(visc%Kd_shear, "Kd_shear", restart_CS)) then
-      do k=1,nz+1 ; do j=js,je ; do i=is,ie
-        visc%Kd_shear(i,j,k) = Z2_T_rescale * visc%Kd_shear(i,j,k)
-      enddo ; enddo ; enddo
-    endif ; endif
-
-    if (associated(visc%Kv_shear)) then ; if (query_initialized(visc%Kv_shear, "Kv_shear", restart_CS)) then
-      do k=1,nz+1 ; do j=js,je ; do i=is,ie
-        visc%Kv_shear(i,j,k) = Z2_T_rescale * visc%Kv_shear(i,j,k)
-      enddo ; enddo ; enddo
-    endif ; endif
-
-    if (associated(visc%Kv_shear_Bu)) then ; if (query_initialized(visc%Kv_shear_Bu, "Kv_shear_Bu", restart_CS)) then
-      do k=1,nz+1 ; do J=js-1,je ; do I=is-1,ie
-        visc%Kv_shear_Bu(I,J,k) = Z2_T_rescale * visc%Kv_shear_Bu(I,J,k)
-      enddo ; enddo ; enddo
-    endif ; endif
-  endif
-
-  if (MLE_use_PBL_MLD .and. (Z_rescale /= 1.0)) then
-    if (associated(visc%MLD)) then ; if (query_initialized(visc%MLD, "MLD", restart_CS)) then
-      do j=js,je ; do i=is,ie
-        visc%MLD(i,j) = Z_rescale * visc%MLD(i,j)
-      enddo ; enddo
-    endif ; endif
-  endif
-
 end subroutine set_visc_init
 
 !> This subroutine dellocates any memory in the set_visc control structure.
diff --git a/src/tracer/boundary_impulse_tracer.F90 b/src/tracer/boundary_impulse_tracer.F90
index 2a3727bdca..17c1f30525 100644
--- a/src/tracer/boundary_impulse_tracer.F90
+++ b/src/tracer/boundary_impulse_tracer.F90
@@ -189,10 +189,6 @@ subroutine initialize_boundary_impulse_tracer(restart, day, G, GV, US, h, diag,
     endif
   enddo ! Tracer loop
 
-  if (restart .and. (US%s_to_T_restart /= 0.0) .and. (US%s_to_T_restart /= 1.0) ) then
-    CS%remaining_source_time = (1.0 / US%s_to_T_restart) * CS%remaining_source_time
-  endif
-
   if (associated(OBC)) then
   ! Steal from updated DOME in the fullness of time.
   endif
diff --git a/src/user/MOM_controlled_forcing.F90 b/src/user/MOM_controlled_forcing.F90
index d218b4ea80..363a41f72f 100644
--- a/src/user/MOM_controlled_forcing.F90
+++ b/src/user/MOM_controlled_forcing.F90
@@ -525,8 +525,6 @@ subroutine controlled_forcing_init(Time, G, US, param_file, diag, CS)
 
   ! Local variables
   real :: smooth_len    ! A smoothing lengthscale [L ~> m]
-  real :: RZ_T_rescale  ! Unit conversion factor for precipiation [T kg m-2 s-1 R-1 Z-1 ~> 1]
-  real :: QRZ_T_rescale ! Unit conversion factor for head fluxes [T W m-2 Q-1 R-1 Z-1 ~> 1]
   logical :: do_integrated
   integer :: num_cycle
   integer :: i, j, isc, iec, jsc, jec, m
@@ -601,53 +599,6 @@ subroutine controlled_forcing_init(Time, G, US, param_file, diag, CS)
          'Control Corrective Precipitation', 'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s)
   endif
 
-  ! Rescale if there are differences between the dimensional scaling of variables in
-  ! restart files from those in use for this run.
-  if ((US%J_kg_to_Q_restart*US%kg_m3_to_R_restart*US%m_to_Z_restart*US%s_to_T_restart /= 0.0) .and. &
-      (US%s_to_T_restart /= US%J_kg_to_Q_restart * US%kg_m3_to_R_restart * US%m_to_Z_restart) ) then
-    ! Redo the scaling of the corrective heat fluxes to [Q R Z T-1 ~> W m-2]
-    QRZ_T_rescale = US%s_to_T_restart / (US%J_kg_to_Q_restart * US%kg_m3_to_R_restart * US%m_to_Z_restart)
-
-    if (associated(CS%heat_0)) then
-      do j=jsc,jec ; do i=isc,iec
-        CS%heat_0(i,j) = QRZ_T_rescale * CS%heat_0(i,j)
-      enddo ; enddo
-    endif
-
-    if ((CS%num_cycle > 0) .and. associated(CS%heat_cyc)) then
-      do m=1,CS%num_cycle ; do j=jsc,jec ; do i=isc,iec
-        CS%heat_cyc(i,j,m) = QRZ_T_rescale * CS%heat_cyc(i,j,m)
-      enddo ; enddo ; enddo
-    endif
-  endif
-
-  if ((US%kg_m3_to_R_restart * US%m_to_Z_restart * US%s_to_T_restart /= 0.0) .and. &
-      (US%s_to_T_restart /= US%kg_m3_to_R_restart * US%m_to_Z_restart) ) then
-    ! Redo the scaling of the corrective precipitation to [R Z T-1 ~> kg m-2 s-1]
-    RZ_T_rescale = US%s_to_T_restart / (US%kg_m3_to_R_restart * US%m_to_Z_restart)
-
-    if (associated(CS%precip_0)) then
-      do j=jsc,jec ; do i=isc,iec
-        CS%precip_0(i,j) = RZ_T_rescale * CS%precip_0(i,j)
-      enddo ; enddo
-    endif
-
-    if ((CS%num_cycle > 0) .and. associated(CS%precip_cyc)) then
-      do m=1,CS%num_cycle ; do j=jsc,jec ; do i=isc,iec
-        CS%precip_cyc(i,j,m) = RZ_T_rescale * CS%precip_cyc(i,j,m)
-      enddo ; enddo ; enddo
-    endif
-  endif
-
-  if ((CS%num_cycle > 0) .and. associated(CS%avg_time) .and. &
-      ((US%s_to_T_restart /= 0.0) .and. (US%s_to_T_restart /= 1.0)) ) then
-    ! Redo the scaling of the accumulated times to [T ~> s]
-    do m=1,CS%num_cycle
-      CS%avg_time(m) = (1.0 / US%s_to_T_restart) * CS%avg_time(m)
-    enddo
-  endif
-
-
 end subroutine controlled_forcing_init
 
 !> Clean up this modules control structure.