[DF-4399] Unused variables removed.