Removed TraceLines and sped up /tsv by about 1/4