LPS-45491 Simplify