LPS-42414 Simplify more logic