LPS-47775 Simplify