LPS-43709 Simplify