diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 188446ce95c3ebb6e49f1cc917cfdd87e4e7882e..a866891a3c58ff777762fc6ad8de0158cbe07ad1 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -21,7 +21,6 @@ half_width = 50  # search box centered on AEOLUS profile (FGF coordinates)
 num_elems = 5424
 num_lines = 5424
 
-clavrx_params = None
 
 def get_amvs(amv_ds, timestamp, filepath=None):
     if filepath is None:
@@ -1490,6 +1489,7 @@ def get_cloud_layers_dict_s(aeolus_files_dir, lon360=False):
 def match_aeolus_to_clavrx(aeolus_dict, clvrx_files):
     nav = get_navigation()
     match_dict = {}
+    clavrx_params = clvrx_files.get_parameters()
 
     keys = list(aeolus_dict.keys())
 
@@ -1538,7 +1538,7 @@ def match_aeolus_to_clavrx(aeolus_dict, clvrx_files):
     return match_dict
 
 
-def create_file_2(match_dct, filename, clvrx_params=clavrx_params):
+def create_file_2(match_dct, filename, clvrx_params):
     grd_x_len = 9
     grd_y_len = 9
     num_aparams = 7
@@ -2062,21 +2062,3 @@ def analyze(prof_da, amvs_da, prof_locs_da, dist_threshold=5.0):
     print('fraction hits multi layer: ', cnt/num_profs)
     return one_lyr_profs, one_lyr_amvs
 
-
-def get_parameters_clavrx(filename='/home/rink/data/clavrx/clavrx_OR_ABI-L1b-RadC-M3C01_G16_s20190020002186.level2.nc'):
-    rg = Dataset(filename, 'r')
-    vars = rg.variables
-    var_names = list(vars.keys())
-    var_names_2d = []
-
-    for str in var_names:
-        v = vars[str]
-        if len(v.shape) == 2:
-            if not (str.find('latitude') != -1 or str.find('longitude') != -1):
-                var_names_2d.append(str)
-
-    rg.close()
-
-    return var_names_2d
-
-clavrx_params = get_parameters_clavrx()