LPS-43709 Removes not needed code