TABDEV-1558, TABDEV-1561: Cleanup and eliminated unneeded variable.