diff --git a/src/cloud_mask/ECM2/nbm_cloud_mask_clavrx_bridge_module.f90 b/src/cloud_mask/ECM2/nbm_cloud_mask_clavrx_bridge_module.f90
index 35af2ab13efae604eaa663bd811890ce8b070c5b..676752e3ff54189a277c51a91b35797a32964d4f 100644
--- a/src/cloud_mask/ECM2/nbm_cloud_mask_clavrx_bridge_module.f90
+++ b/src/cloud_mask/ECM2/nbm_cloud_mask_clavrx_bridge_module.f90
@@ -117,7 +117,6 @@ module ECM2_CLOUD_MASK_CLAVRX_BRIDGE
    private :: BETA_11_12_OVERLAP_TEST
    private :: BETA_11_133_OVERLAP_TEST
    private :: WATER_EDGE_FILTER
-   private :: UNCERTAIN_PHASE_FILTER
    private :: MODIS_AQUA_SBAF
    private :: ABI_GOES16_SBAF
    private :: SBAF_QUAD
@@ -446,21 +445,18 @@ contains
 
             endif
 
+            !-- this logic could extend supercooled to water erroneously
+            if ((Cld_Phase(i,j) == sym%SUPERCOOLED_PHASE) .and. (Tc_Opaque_Cloud(i,j) >= 273.0)) then
+               Cld_Phase(i,j) = sym%WATER_PHASE
+            endif
+
         endif
 
       end do elem_loop_lrc
    end do line_loop_lrc
 
-   !--- apply median filter to pixels with uncertain phase
-   call UNCERTAIN_PHASE_FILTER(Cld_Phase,Cld_Phase_Uncertainty,5)
-
-   !--- account for supercooled and water phase consistency
-   where((Cld_Phase == sym%SUPERCOOLED_PHASE) .and. (Tc_Opaque_Cloud .GEfp. 273.0))
-          Cld_Phase = sym%WATER_PHASE
-   end where
-   where((Cld_Phase == sym%WATER_PHASE) .and. (Tc_Opaque_Cloud < 273.0))
-          Cld_Phase = sym%SUPERCOOLED_PHASE
-   end where
+   !--- try to remove water edges around cirrus that impacts AMVs
+   call WATER_EDGE_FILTER(Cld_Phase,2)
 
    !---  WAITPOINT cloud mask done
    call waitpoint(2)