LPS-35767 Removed unused code