LPS-32579 Clean up dead code