TIMOB-12493-Reverted previous change and put the fix in processData to cleanup rows properly