Cleanup dependencies in external CtxBroker