TEIID-2430 adding better sortutility cleanup