Remove temporary logging, add global context.