Removed some dead tracing code