Remove more mentions of the topic collector.