Removed tracing added for debugging purposes