Removed set_trace calls