LPS-40190 Simplify