LPS-50406 Simplify