diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua
index 4fc605bc83..ce3212dfe9 100644
--- a/modulefiles/tasks/hera/run_vx.local.lua
+++ b/modulefiles/tasks/hera/run_vx.local.lua
@@ -1,3 +1,3 @@
 append_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-load(pathJoin("intel", os.gentenv("intel_ver") or "18.0.5.274"))
+load(pathJoin("intel", os.getenv("intel_ver") or "18.0.5.274"))
 load(pathJoin("anaconda", os.getenv("anaconda_ver") or "latest"))
diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua
index 26cbb9088c..13b6b4b954 100644
--- a/modulefiles/tasks/jet/run_vx.local.lua
+++ b/modulefiles/tasks/jet/run_vx.local.lua
@@ -1,3 +1,3 @@
 append_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-load(pathJoin("intel", os.gentenv("intel_ver") or "18.0.5.274"))
+load(pathJoin("intel", os.getenv("intel_ver") or "18.0.5.274"))
 load(pathJoin("anaconda", os.getenv("anaconda_ver") or "5.3.1"))
diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml
index 43d29abe2f..1a25bee535 100644
--- a/ush/config_defaults.yaml
+++ b/ush/config_defaults.yaml
@@ -1575,24 +1575,6 @@ task_run_fcst:
   #
   #-----------------------------------------------------------------------
   #
-  # Set the array parameter containing the names of all the fields that the
-  # MAKE_SFC_CLIMO_TN task generates on the native FV3-LAM grid.
-  #
-  #-----------------------------------------------------------------------
-  #
-  SFC_CLIMO_FIELDS: [
-  "facsf",
-  "maximum_snow_albedo",
-  "slope_type",
-  "snowfree_albedo",
-  "soil_type",
-  "substrate_temperature",
-  "vegetation_greenness",
-  "vegetation_type"
-  ]
-  #
-  #-----------------------------------------------------------------------
-  #
   # Set parameters associated with the fixed (i.e. static) files.  Definitions:
   #
   # SYMLINK_FIX_FILES:
diff --git a/ush/test_retrieve_data.py b/ush/test_retrieve_data.py
index dc7a775f05..dffa638562 100644
--- a/ush/test_retrieve_data.py
+++ b/ush/test_retrieve_data.py
@@ -39,6 +39,7 @@ def test_fv3gfs_grib2_lbcs_from_hpss(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'fcst',
                 '--config', self.config,
@@ -50,6 +51,7 @@ def test_fv3gfs_grib2_lbcs_from_hpss(self):
                 '--debug',
                 '--file_type', 'grib2',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -69,6 +71,7 @@ def test_fv3gfs_netcdf_lbcs_from_hpss(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'fcst',
                 '--config', self.config,
@@ -80,6 +83,7 @@ def test_fv3gfs_netcdf_lbcs_from_hpss(self):
                 '--debug',
                 '--file_type', 'netcdf',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -99,6 +103,7 @@ def test_gdas_ics_from_aws(self):
 
             out_path_tmpl = f"mem{{mem:03d}}"
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'anl',
                 '--config', self.config,
@@ -111,6 +116,7 @@ def test_gdas_ics_from_aws(self):
                 '--file_type', 'netcdf',
                 '--members', '9', '10',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -132,6 +138,7 @@ def test_gefs_grib2_ics_from_aws(self):
 
             out_path_tmpl = f"mem{{mem:03d}}"
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'anl',
                 '--config', self.config,
@@ -144,6 +151,7 @@ def test_gefs_grib2_ics_from_aws(self):
                 '--file_type', 'netcdf',
                 '--members', '1', '2',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -163,6 +171,7 @@ def test_hrrr_ics_from_hpss(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'anl',
                 '--config', self.config,
@@ -173,6 +182,7 @@ def test_hrrr_ics_from_hpss(self):
                 '--output_path', tmp_dir,
                 '--debug',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -190,6 +200,7 @@ def test_hrrr_lbcs_from_hpss(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'fcst',
                 '--config', self.config,
@@ -200,6 +211,7 @@ def test_hrrr_lbcs_from_hpss(self):
                 '--output_path', tmp_dir,
                 '--debug',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -216,6 +228,7 @@ def test_hrrr_ics_from_aws(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'anl',
                 '--config', self.config,
@@ -226,6 +239,7 @@ def test_hrrr_ics_from_aws(self):
                 '--output_path', tmp_dir,
                 '--debug',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -242,6 +256,7 @@ def test_hrrr_lbcs_from_aws(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'fcst',
                 '--config', self.config,
@@ -252,6 +267,7 @@ def test_hrrr_lbcs_from_aws(self):
                 '--output_path', tmp_dir,
                 '--debug',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -269,6 +285,7 @@ def test_rap_ics_from_aws(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'anl',
                 '--config', self.config,
@@ -279,6 +296,7 @@ def test_rap_ics_from_aws(self):
                 '--output_path', tmp_dir,
                 '--debug',
             ]
+            # fmt: on
 
             retrieve_data.main(args)
 
@@ -296,6 +314,7 @@ def test_rap_lbcs_from_aws(self):
         with tempfile.TemporaryDirectory(dir=".") as tmp_dir:
             os.chdir(tmp_dir)
 
+            # fmt: off
             args = [
                 '--anl_or_fcst', 'fcst',
                 '--config', self.config,
@@ -306,6 +325,7 @@ def test_rap_lbcs_from_aws(self):
                 '--output_path', tmp_dir,
                 '--debug',
             ]
+            # fmt: on
 
             retrieve_data.main(args)