integrate with xservice, clean irrelevant module