Cleaned up some tracers.
Cleaned up some tracers.