diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 438a2f450..f3d2d933a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -11,39 +11,6 @@ Are changes expected to change answers? (specify if bfb, different at roundoff,
 Any User Interface Changes (namelist or namelist defaults changes)?
 
 ### Testing performed
+Please describe the tests along with the target model and machine(s) 
+If possible, please also added hashes that were used in the testing
 
-Testing performed if application target is CESM:
-- [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
-   - machines:
-   - details (e.g. failed tests):
-- [ ] (recommended) CESM testlist_drv.xml
-   - machines and compilers:
-   - details (e.g. failed tests):
-- [ ] (optional) CESM prealpha test
-   - machines and compilers
-   - details (e.g. failed tests):
-- [ ] (other) please described in detail
-   - machines and compilers
-   - details (e.g. failed tests):
-
-Testing performed if application target is UFS-coupled:
-- [ ] (recommended) UFS-coupled testing
-   - description:
-   - details (e.g. failed tests):
-
-Testing performed if application target is UFS-HAFS:
-- [ ] (recommended) UFS-HAFS testing
-   - description:
-   - details (e.g. failed tests):
-
-### Hashes used for testing:
-
-- [ ] CESM:
-  - repository to check out: https://github.com/ESCOMP/CESM.git
-  - branch/hash:
-- [ ] UFS-coupled, then umbrella repostiory to check out and associated hash:
-  - repository to check out:
-  - branch/hash:
-- [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash:
-  - repository to check out:
-  - branch/hash:
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 7f9bac96e..f986cfad2 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -1361,87 +1361,6 @@
   </entry>
 
   <!--- map files -->
-  <!--- comment out map type for now, tcraig 3/25/13 -->
-
-  <entry id="ATM2OCN_FMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>atm2ocn flux mapping file</desc>
-  </entry>
-
-  <entry id="ATM2OCN_SMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>atm2ocn state mapping file</desc>
-  </entry>
-
-  <entry id="ATM2OCN_VMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>atm2ocn vector mapping file</desc>
-  </entry>
-
-  <entry id="ATM2LND_FMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>atm2lnd flux mapping file</desc>
-  </entry>
-
-  <entry id="ATM2LND_SMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>atm2lnd state mapping file</desc>
-  </entry>
-
-  <entry id="ATM2WAV_SMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>atm2wav state mapping file</desc>
-  </entry>
-
-  <entry id="OCN2ATM_FMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>ocn2atm flux mapping file</desc>
-  </entry>
-
-  <entry id="OCN2ATM_SMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>ocn2atm state mapping file</desc>
-  </entry>
-
-  <entry id="LND2ATM_FMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>lnd2atm flux mapping file</desc>
-  </entry>
-
-  <entry id="LND2ATM_SMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>lnd2atm state mapping file</desc>
-  </entry>
 
   <entry id="LND2ROF_FMAPNAME">
     <type>char</type>