HPCC-11202 - Added additional tracing and removed redundant code