Removed some unnessisary tracing for speed.