LPS-42105 LPS-38575 Remove unused variable