removed tracing code