diff --git a/parm/archive/master_gefs.yaml.j2 b/parm/archive/master_gefs.yaml.j2
index e76d7c9f7a..e33215a23c 100644
--- a/parm/archive/master_gefs.yaml.j2
+++ b/parm/archive/master_gefs.yaml.j2
@@ -4,13 +4,6 @@
 {% set cycle_YMDH = current_cycle | to_YMDH %}
 
 datasets:
-{% filter indent(width=4) %}
-    {% include "gefs_extracted_atmos.yaml.j2" %}
-    {% include "gefs_extracted_ocean.yaml.j2" %}
-    {% include "gefs_extracted_ice.yaml.j2" %}
-    {% include "gefs_extracted_wave.yaml.j2" %}
-{% endfilter %}
-
 # Archive the EXPDIR if requested
 {% if archive_expdir %}
 {% filter indent(width=4) %}
diff --git a/workflow/applications/gefs.py b/workflow/applications/gefs.py
index 33545eb2ec..2e08ddc21d 100644
--- a/workflow/applications/gefs.py
+++ b/workflow/applications/gefs.py
@@ -91,8 +91,8 @@ def get_task_names(self):
             tasks += ['wavepostpnt']
 
         if options['do_extractvars']:
-            tasks += ['extractvars', 'arch']
+            tasks += ['extractvars']
 
-        tasks += ['cleanup']
+        tasks += ['arch', 'cleanup']
 
         return {f"{self.run}": tasks}
diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py
index f89d3dbbb0..f1b1cd1ea2 100644
--- a/workflow/rocoto/gefs_tasks.py
+++ b/workflow/rocoto/gefs_tasks.py
@@ -569,7 +569,7 @@ def arch(self):
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
 
         resources = self.get_resource('arch')
-        task_name = 'arch'
+        task_name = 'gefs_arch'
         task_dict = {'task_name': task_name,
                      'resources': resources,
                      'envars': self.envars,
@@ -587,33 +587,9 @@ def arch(self):
 
     def cleanup(self):
         deps = []
-        if self.options['do_extractvars']:
-            dep_dict = {'type': 'task', 'name': 'arch'}
-            deps.append(rocoto.add_dependency(dep_dict))
-            dependencies = rocoto.create_dependency(dep=deps)
-        else:
-            dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_prod'}
-            deps.append(rocoto.add_dependency(dep_dict))
-            dep_dict = {'type': 'metatask', 'name': 'gefs_atmos_ensstat'}
-            deps.append(rocoto.add_dependency(dep_dict))
-            if self.options['do_ice']:
-                dep_dict = {'type': 'metatask', 'name': 'gefs_ice_prod'}
-                deps.append(rocoto.add_dependency(dep_dict))
-            if self.options['do_ocean']:
-                dep_dict = {'type': 'metatask', 'name': 'gefs_ocean_prod'}
-                deps.append(rocoto.add_dependency(dep_dict))
-            if self.options['do_wave']:
-                dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_grid'}
-                deps.append(rocoto.add_dependency(dep_dict))
-                dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_pnt'}
-                deps.append(rocoto.add_dependency(dep_dict))
-                if self.options['do_wave_bnd']:
-                    dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt'}
-                    deps.append(rocoto.add_dependency(dep_dict))
-                    dep_dict = {'type': 'metatask', 'name': 'gefs_wave_post_bndpnt_bull'}
-                    deps.append(rocoto.add_dependency(dep_dict))
-            dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
-
+        dep_dict = {'type': 'task', 'name': 'gefs_arch'}
+        deps.append(rocoto.add_dependency(dep_dict))
+        dependencies = rocoto.create_dependency(dep=deps)
         resources = self.get_resource('cleanup')
         task_name = 'gefs_cleanup'
         task_dict = {'task_name': task_name,