HPCC-10414 Checkpoint1

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
HPCC-10414 Remove redundant parameters

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
checkpoint2

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>