Get rid of trace dependency