Code refactoring, switch off pipeline tracing