House cleaning.
Fixed tracing.