LPS-47647 simplify