body: remove excessive context propagation