Remove a few trace logs.
Remove wrong code.
Add tracing.