diff --git a/templates/event-generator/adapt_member.sh b/templates/event-generator/adapt_member.sh
index 1c4eb6b22cd2383cc340fdbe15d97c737ad582dc..77945ebd0bf4c1f2adf258b9f246f38feb683537 100644
--- a/templates/event-generator/adapt_member.sh
+++ b/templates/event-generator/adapt_member.sh
@@ -55,10 +55,6 @@ interpolate_SST "${DESTINATION_GRID}" "${SST_FORCING}" "${INTERPOLATED_SST}"
 integrate_sst_to_extpar "${INTERPOLATED_SST}" "${EXTERNAL_PARAMETERS_FILE}"
 
 
-
-# Trying to unset ECCCODES variables.
-unset ECCODES_DEFINITION_PATH
-
-old_integrate_sst_to_analysis "${INTERPOLATED_SST}" "${ANALYSIS_FILE}"
+#old_integrate_sst_to_analysis "${INTERPOLATED_SST}" "${ANALYSIS_FILE}"
 # Integrate sst to analysis
-#integrate_sst_to_analysis "${DESTINATION_GRID}" "${ANALYSIS_FILE}"
+integrate_sst_to_analysis "${DESTINATION_GRID}" "${ANALYSIS_FILE}"
diff --git a/templates/event-generator/adapt_member_utils.sh b/templates/event-generator/adapt_member_utils.sh
index b20eba88ec6b306505fb7305ed1176c9e2775e86..03da1888c07365da125b40b268a858e3a841f67b 100644
--- a/templates/event-generator/adapt_member_utils.sh
+++ b/templates/event-generator/adapt_member_utils.sh
@@ -133,10 +133,16 @@ END
 from enstools.io import read
 
 with read("${ANALYSIS_FILE}") as ds, open('remap.nml', 'a') as file:
-   for ida, da in enumerate(ds):
+    all_vars = list(ds.data_vars)
+    remap_vars = []
+    for var in all_vars:
+        if not "bnds" in var and not '_vertices' in var and not 'lat' in var and not 'lon' in var:
+            remap_vars.append(var)
+
+   for var in remap_vars:
        file.write('&input_field_nml\n')
-       file.write(f'inputname = "{da}"\n')
-       file.write(f'outputname = "{da}"\n')
+       file.write(f'inputname = "{var}"\n')
+       file.write(f'outputname = "{var}"\n')
        file.write('/\n\n')
 END