removed classes from tracer2