LPS-44555 Remove unused variables