Clean up tracing more