Update logging to use Trace by default rather than Debug.
Remove redundant TODO.