LPS-39057 LPS-38480 Remove unused code