Feature/disable trace