removed dependence on tracing code