[CW/PL] [69575420] Simplify