LPS-49785 simplify