LPS-51308 Removes no needed code