Removed more tracing