diff --git a/cime_config/buildnml b/cime_config/buildnml
index bc8585d8..294ac732 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -106,7 +106,6 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     config["COMP_OCN"] = case.get_value("COMP_OCN")
     config["COMP_ROF"] = case.get_value("COMP_ROF")
     config["COMP_WAV"] = case.get_value("COMP_WAV")
-    config["CAMDEV"] = "True" if "CAM70" in case.get_value("COMPSET") else "False"
     
     if (
         (
@@ -145,11 +144,6 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     # set aquaplanet if appropriate
     if config["COMP_OCN"] == "docn" and "aqua" in case.get_value("DOCN_MODE"):
         nmlgen.set_value("aqua_planet", value=".true.")
-
-    # make sure that variable add_gusts is only set to true if compset includes cam7 physics
-    add_gusts = literal_to_python_value(nmlgen.get_value("add_gusts"), type_="logical")
-    if add_gusts:
-        expect("CAM70" in case.get_value("COMPSET"),"ERROR: add_gusts can only be set if CAM70 in compset {}".format(case.get_value("COMPSET")))
             
     # --------------------------------
     # Overwrite: set component coupling frequencies
diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
index 0f8622af..43fbf0cb 100644
--- a/cime_config/namelist_definition_drv.xml
+++ b/cime_config/namelist_definition_drv.xml
@@ -944,19 +944,6 @@
     </values>
   </entry>
 
-  <entry id="add_gusts">
-    <type>logical</type>
-    <category>control</category>
-    <group>MED_attributes</group>
-    <desc>
-      add a wind gustiness factor
-    </desc>
-    <values>
-      <value CAMDEV="True">.true.</value>
-      <value CAMDEV="False">.false.</value>
-    </values>
-  </entry>
-
   <entry id="do_budgets" modify_via_xml="BUDGETS">
     <type>logical</type>
     <category>budget</category>
diff --git a/cime_config/namelist_definition_drv_flds.xml b/cime_config/namelist_definition_drv_flds.xml
index 4d4ab1ec..afcba374 100644
--- a/cime_config/namelist_definition_drv_flds.xml
+++ b/cime_config/namelist_definition_drv_flds.xml
@@ -197,4 +197,17 @@
     </desc>
   </entry>
 
+  <!-- ========================================================================================  -->
+  <!-- Gusts                                                                                     -->
+  <!-- ========================================================================================  -->
+
+  <entry id="add_gusts">
+    <type>logical</type>
+    <category>control</category>
+    <group>wind_gusts_nl</group>
+    <desc>
+      add a wind gustiness factor
+    </desc>
+  </entry>
+  
 </entry_id>