LPS-47664 simplify