LPS-42543 Simplify