diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index ba63151611589e51d31a32401f601bd7c34bbcf0..c60a2492a4fb5bdfee21f7a0052f3f1b6b44ddcf 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -1858,11 +1858,9 @@ def create_file(filename, aeolus_to_amv_dct, aeolus_dct, amv_files, cld_lyr=Fals
 # amv_files_dir: G16/17 AMV product files
 # outfile: pathname for the Netcdf match file
 def create_amv_to_aeolus_match_file(aeolus_files_dir, amv_files_dir, outfile=None, amv_source='OPS', band='14', chan='mie'):
-    if chan == 'mie':
-        a_d = get_cloud_layers_dict_s(aeolus_files_dir)
-    else:
-        a_d = get_aeolus_time_dict_s(aeolus_files_dir, chan=chan)
-        a_d = time_dict_to_nd_0(a_d)
+
+    a_d = get_aeolus_time_dict_s(aeolus_files_dir, chan=chan)
+    a_d = time_dict_to_nd(a_d)
 
     amv_files = None
     if amv_source == 'CARR':
@@ -1873,10 +1871,7 @@ def create_amv_to_aeolus_match_file(aeolus_files_dir, amv_files_dir, outfile=Non
     m_d = match_amvs_to_aeolus(a_d, amv_files_dir, amv_source, band, amv_files)
 
     if outfile is not None:
-        cld_lyr = False
-        if chan == 'mie':
-            cld_lyr = True
-        create_file(outfile, m_d, a_d, amv_files, cld_lyr=cld_lyr)
+        create_file(outfile, m_d, a_d, amv_files)
 
 
 # match_file: pathname for the product file