Cleaned up some tracers.