LPS-22792 Simplify