LPS-38457 Simplify