Cleaning up irrelevant tracer stuff for pixelsampler branch.