Removed tracing and logging