Merge "Remove redundant traces"