Remove inneficiant tracer + transform static array into non static