LPS-49600 Simplify