removed excess tracing