Removed some tracing