Work withs the topic collector.

- Support for the new restful API.
- Remove TC specific bits.
- Various clean-ups