LPS-33078 Remove unused code