diff --git a/satpy/etc/composites/abi.yaml b/satpy/etc/composites/abi.yaml
index 4700aa470b..d4aa8c0185 100644
--- a/satpy/etc/composites/abi.yaml
+++ b/satpy/etc/composites/abi.yaml
@@ -36,7 +36,7 @@ composites:
       - name: C02
         modifiers: [sunz_corrected, rayleigh_corrected_crefl]
       - name: C03
-        modifiers: [sunz_corrected, rayleigh_corrected_crefl]
+        modifiers: [sunz_corrected]
     standard_name: toa_bidirectional_reflectance
 
   green_raw:
@@ -710,7 +710,7 @@ composites:
     compositor: !!python/name:satpy.composites.SelfSharpenedRGB
     prerequisites:
       - name: C03
-        modifiers: [sunz_corrected, rayleigh_corrected]
+        modifiers: [sunz_corrected]
       - name: C02
         modifiers: [sunz_corrected, rayleigh_corrected]
       - name: green
diff --git a/satpy/etc/composites/ahi.yaml b/satpy/etc/composites/ahi.yaml
index 5d633056be..179f36c97c 100644
--- a/satpy/etc/composites/ahi.yaml
+++ b/satpy/etc/composites/ahi.yaml
@@ -214,11 +214,11 @@ composites:
     compositor: !!python/name:satpy.composites.SelfSharpenedRGB
     prerequisites:
     - wavelength: 1.63
-      modifiers: [sunz_corrected] #, rayleigh_corrected]
+      modifiers: [sunz_corrected]
     - wavelength: 0.85
-      modifiers: [sunz_corrected] #, rayleigh_corrected]
+      modifiers: [sunz_corrected]
     - wavelength: 0.635
-      modifiers: [sunz_corrected] #, rayleigh_corrected]
+      modifiers: [sunz_corrected]
     high_resolution_band: blue
     standard_name: natural_color
 
@@ -303,34 +303,6 @@ composites:
       - name: B01
     standard_name: true_color_reproduction_color_stretch
 
-#  true_color_reducedsize_land:
-#    compositor: !!python/name:satpy.composites.GenericCompositor
-#    prerequisites:
-#    - wavelength: 0.65
-#      modifiers: [reducer4, effective_solar_pathlength_corrected,
-#                  rayleigh_corrected_reducedsize_land]
-#    - wavelength: 0.51
-#      modifiers: [reducer2, vegetation_corrected_reduced, effective_solar_pathlength_corrected,
-#                  rayleigh_corrected_reducedsize_land]
-#    - wavelength: 0.46
-#      modifiers: [reducer2, effective_solar_pathlength_corrected,
-#                  rayleigh_corrected_reducedsize_land]
-#    standard_name: true_color
-#
-#  true_color_reducedsize_marine_tropical:
-#    compositor: !!python/name:satpy.composites.GenericCompositor
-#    prerequisites:
-#    - wavelength: 0.65
-#      modifiers: [reducer4, effective_solar_pathlength_corrected,
-#                  rayleigh_corrected_reducedsize_marine_tropical]
-#    - wavelength: 0.51
-#      modifiers: [reducer2, vegetation_corrected_reduced, effective_solar_pathlength_corrected,
-#                  rayleigh_corrected_reducedsize_marine_tropical]
-#    - wavelength: 0.46
-#      modifiers: [reducer2, effective_solar_pathlength_corrected,
-#                  rayleigh_corrected_reducedsize_marine_tropical]
-#    standard_name: true_color
-
   day_microphysics_eum:
     compositor: !!python/name:satpy.composites.GenericCompositor
     prerequisites:
diff --git a/satpy/etc/composites/ami.yaml b/satpy/etc/composites/ami.yaml
index b0d943c5ca..a58463a93a 100644
--- a/satpy/etc/composites/ami.yaml
+++ b/satpy/etc/composites/ami.yaml
@@ -137,11 +137,11 @@ composites:
     compositor: !!python/name:satpy.composites.SelfSharpenedRGB
     prerequisites:
       - name: NR016
-        modifiers: [sunz_corrected] #, rayleigh_corrected]
+        modifiers: [sunz_corrected]
       - name: VI008
-        modifiers: [sunz_corrected] #, rayleigh_corrected]
+        modifiers: [sunz_corrected]
       - name: VI006
-        modifiers: [sunz_corrected] #, rayleigh_corrected]
+        modifiers: [sunz_corrected]
     high_resolution_band: blue
     standard_name: natural_color