LPS-43557 Simplify