Remove unused code in internal Context Broker