clean up
more tracing.