Merge "Revert "Revert "Removing unused tracing"""