LPS-46775 Simplify