Cleanup from task/tracer re-organisation