Removed extra tracing