LPS-50031 Fix unused variables