Cleaned up tracing.