TopicDao cleanup