Cleanup traces
More trace cleaning