Merge "Removing unused tracing"