TopicService cleanup